[libcvd-members] libcvd/cvd image.h internal/io/jpeg.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        07/07/23 22:38:05

Modified files:
        cvd            : image.h 
        cvd/internal/io: jpeg.h 

Log message:
        Fix some warnings/errors from -Wextra -pedantic

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/image.h?cvsroot=libcvd&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/jpeg.h?cvsroot=libcvd&r1=1.3&r2=1.4

Patches:
Index: image.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/image.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- image.h     28 Mar 2007 21:59:49 -0000      1.34
+++ image.h     23 Jul 2007 22:38:05 -0000      1.35
@@ -502,10 +502,8 @@
                /// Copy constructor
                /// @param copyof The image to copy
                BasicImage(const BasicImage& copyof)
+               :SubImage<T>(copyof)
                {
-                 SubImage<T>::my_size = copyof.my_size;
-                 SubImage<T>::my_data = copyof.my_data;
-                 SubImage<T>::my_stride = copyof.my_stride;
                }
        
                /// The image data is not destroyed when a BasicImage is 
destroyed.

Index: internal/io/jpeg.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/jpeg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- internal/io/jpeg.h  19 Jun 2007 12:01:52 -0000      1.3
+++ internal/io/jpeg.h  23 Jul 2007 22:38:05 -0000      1.4
@@ -23,6 +23,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 #include <memory>
 extern "C"{
 #include <jpeglib.h>
@@ -59,10 +60,10 @@
 
   template <class T, class S> struct JPEGReader {
     static void read(BasicImage<T>& im, jpeg_in& jpeg) {
-      S rowbuf[jpeg.x_size()];
+      std::vector<S> rowbuf(jpeg.x_size());
       for (int r=0; r<jpeg.y_size(); r++) {
-       jpeg.get_raw_pixel_lines((byte*)rowbuf, 1);
-       Pixel::ConvertPixels<S,T>::convert(rowbuf, im[r], jpeg.x_size());
+       jpeg.get_raw_pixel_lines((byte*)rowbuf.data(), 1);
+       Pixel::ConvertPixels<S,T>::convert(rowbuf.data(), im[r], jpeg.x_size());
       }
     }
   };