Merge pull request #41 from inteltiger/fix-compiler-warning

fix duplicated return and other warnings reported by compiler

Author: yanyings

src/360SCVP/360SCVPBitstream.cpp

@@ -512,8 +512,6 @@ uint32_t gts_bs_write_data(GTS_BitStream *bs, const int8_t *data, uint32_t nbByt
             }
             memcpy_s(bs->buffer_io+bs->buffer_written, nbBytes, data, nbBytes);
             bs->buffer_written += nbBytes;
-            return nbBytes;
-
             if (gts_fwrite(data, nbBytes, 1, bs->stream) != 1) return 0;
             if (bs->size == bs->position) bs->size += nbBytes;
             bs->position += nbBytes;

src/360SCVP/360SCVPGeometry.h

@@ -62,8 +62,8 @@ struct SPos
     POSType x;
     POSType y;
     POSType z;
-    SPos() : faceIdx(0), x(0), y(0), z(0) {};
-    SPos(int32_t f, POSType xIn, POSType yIn, POSType zIn ) : faceIdx(f), x(xIn), y(yIn), z(zIn) {};
+    SPos() : faceIdx(0), x(0), y(0), z(0) {}
+    SPos(int32_t f, POSType xIn, POSType yIn, POSType zIn ) : faceIdx(f), x(xIn), y(yIn), z(zIn) {}
 };
 
 struct GeometryRotation
@@ -76,7 +76,7 @@ struct ViewPortSettings
     float vFOV;
     float fYaw;              //
     float fPitch;
-    ViewPortSettings() : hFOV(0), vFOV(0), fYaw(0), fPitch(0) {};
+    ViewPortSettings() : hFOV(0), vFOV(0), fYaw(0), fPitch(0) {}
 };
 
 struct SVideoInfo
@@ -101,7 +101,7 @@ class Geometry
     bool m_bPadded;
     bool m_bGeometryMapping;
     bool m_bConvOutputPaddingNeeded;
-    inline int32_t round(POSType t) { return (int32_t)(t+ (t>=0? 0.5 :-0.5)); }; 
+    inline int32_t round(POSType t) { return (int32_t)(t+ (t>=0? 0.5 :-0.5)); }
     void rotate3D(SPos& sPos, int32_t rx, int32_t ry, int32_t rz);
 public:
     int32_t m_numFaces;
@@ -111,7 +111,7 @@ class Geometry
     virtual ~Geometry();
     void geoInit(SVideoInfo& sVideoInfo);
     void geoUnInit(); // just use in the viewport
-    GeometryType getType() { return (GeometryType)m_sVideoInfo.geoType; };
+    GeometryType getType() { return (GeometryType)m_sVideoInfo.geoType; }
     void setPaddingFlag(bool bFlag) { m_bPadded = bFlag; }
     virtual void map2DTo3D(SPos& IPosIn, SPos *pSPosOut) = 0;
     virtual void map3DTo2D(SPos *pSPosIn, SPos *pSPosOut) = 0;

src/360SCVP/360SCVPViewportImpl.h

@@ -101,7 +101,8 @@ class TgenViewport
     UsageType     m_usageType;
     Param_VideoFPStruct m_paramVideoFP;
 
-    inline int32_t round(POSType t) { return (int32_t)(t+ (t>=0? 0.5 :-0.5)); };
+    inline int32_t round(POSType t) { return (int32_t)(t+ (t>=0? 0.5 :-0.5)); }
+
 public:
     TgenViewport();
     virtual ~TgenViewport();