Changeset 1280 for cpp/frams/model

Timestamp:

09/10/23 01:51:57 (15 months ago)

Author:

Maciej Komosinski

Message:

Added explicit type casts (size_t vs. int etc.)

Location:

cpp/frams/model

Files:

• autoname.cpp (modified) (1 diff)
• model.cpp (modified) (1 diff)
• modelparts.h (modified) (2 diffs)
• similarity/simil-match.cpp (modified) (1 diff)

cpp/frams/model/autoname.cpp

@@ -59 +59 @@
 static void przeplatanka(char *out, char *in1, char *in2)
 {
-        int d1 = strlen(in1), d2 = strlen(in2);
+        int d1 = (int)strlen(in1), d2 = (int)strlen(in2);
         int p1 = 0, p2 = 0;
         int pp = d1 + d2;

cpp/frams/model/model.cpp

@@ -610 +610 @@
 int Model::getCheckpointCount()
 {
-        return checkpoints.size();
+        return (int)checkpoints.size();
 }
 

cpp/frams/model/modelparts.h

@@ -229 +229 @@
         SString name, longname, description;
         ParamEntry *props;
-        bool ownedprops;//< destructor will free props using ParamObject::freeParamTab
+        bool ownedprops; //< destructor will free props using ParamObject::freeParamTab
         paInt prefinputs, prefoutput;
         paInt preflocation;
@@ -304 +304 @@
                 return vectordata;
         }
-        void setSymbolGlyph(int *data, bool owned = 1)
+        void setSymbolGlyph(int *data, bool owned = true)
         {
                 if (vectordata && ownedvectordata) delete[]vectordata;
-                vectordata = data; ownedvectordata = owned;
+                vectordata = data;
+                ownedvectordata = owned;
         }
         /** additional information about how the neuron should be drawn

cpp/frams/model/similarity/simil-match.cpp

@@ -69 +69 @@
 
         // return the result
-        return m_apvMatched[Obj]->size();
+        return (int)m_apvMatched[Obj]->size();
 }