Use proper return type & fix assignment readability

asmaloney · asmaloney · commit b5b766168367 · 2021-07-22T19:49:49.000-04:00
diff --git a/src/ReaderImpl.cpp b/src/ReaderImpl.cpp
@@ -414,7 +414,7 @@ namespace e57
    {
       if ( ( imageIndex < 0 ) || ( imageIndex >= images2D_.childCount() ) )
       {
-         return 0;
+         return false;
       }
 
       imageProjection = E57_NO_PROJECTION;
@@ -1297,7 +1297,7 @@ namespace e57
       {
          ustring name = proto.get( protoIndex ).elementName();
          NodeType type = proto.get( protoIndex ).type();
-         bool scaled = type == E57_SCALED_INTEGER ? true : false;
+         bool scaled = (type == E57_SCALED_INTEGER);
          // E57_EXT_surface_normals
          ustring norExtUri;
          bool haveNormalsExt = imf_.extensionsLookupPrefix( "nor", norExtUri );

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ namespace e57`
`414`	`414`	`{`
`415`	`415`	`if ( ( imageIndex < 0 ) \|\| ( imageIndex >= images2D_.childCount() ) )`
`416`	`416`	`{`
`417`		`- return 0;`
	`417`	`+ return false;`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`imageProjection = E57_NO_PROJECTION;`
`@@ -1297,7 +1297,7 @@ namespace e57`
`1297`	`1297`	`{`
`1298`	`1298`	`ustring name = proto.get( protoIndex ).elementName();`
`1299`	`1299`	`NodeType type = proto.get( protoIndex ).type();`
`1300`		`- bool scaled = type == E57_SCALED_INTEGER ? true : false;`
	`1300`	`+ bool scaled = (type == E57_SCALED_INTEGER);`
`1301`	`1301`	`// E57_EXT_surface_normals`
`1302`	`1302`	`ustring norExtUri;`
`1303`	`1303`	`bool haveNormalsExt = imf_.extensionsLookupPrefix( "nor", norExtUri );`