File pfstools-gcc.patch of Package pfstools

Overview Repositories Revisions Requests Users Attributes Meta

File pfstools-gcc.patch of Package pfstools (Revision 486bb4ef00ad52e4f430da2a0085befd)

Currently displaying revision 486bb4ef00ad52e4f430da2a0085befd , Show latest

diff --git a/src/fileformat/exrio.cpp b/src/fileformat/exrio.cpp
index 520d4af..16936ab 100644
--- a/src/fileformat/exrio.cpp
+++ b/src/fileformat/exrio.cpp
@@ -87,7 +87,8 @@ void OpenEXRReader::readImage( pfs::Array2D *R, pfs::Array2D *G,
       (*B)(x,y) = tmp_img[idx].b;
       idx++;
     }
-  delete tmp_img;
+  delete [] tmp_img;
+  tmp_img = NULL;
 }
 
 OpenEXRReader::~OpenEXRReader()
@@ -131,5 +132,6 @@ void OpenEXRWriter::writeImage( pfs::Array2D *R, pfs::Array2D *G,
     throw pfs::Exception( exc.what() );
   }
 
-  delete tmp_img;
+  delete [] tmp_img;
+  tmp_img = NULL;
 }
diff --git a/src/filter/pfspanoramic.cpp b/src/filter/pfspanoramic.cpp
index b7d7d06..22462c6 100644
--- a/src/filter/pfspanoramic.cpp
+++ b/src/filter/pfspanoramic.cpp
@@ -198,7 +198,7 @@ class ProjectionFactory
     {
       char *opts;
       
-      if( (opts = strchr(name, '/')) )
+      if( (opts = (char*)strchr(name, '/')) )
       {
         *opts++ = '\0';
       }
@@ -731,7 +731,7 @@ void panoramic( int argc, char* argv[] )
     {
       char *destination;
 
-      if( set || ( destination = strchr( argv[optind], '+' ) ) == NULL )
+      if( set || ( destination = (char*)strchr( argv[optind], '+' ) ) == NULL )
       {
         fprintf( stderr, PROG_NAME " error: unknown parameter: %s\n", argv[optind]);
         throw QuietException();

Places

File pfstools-gcc.patch of Package pfstools (Revision 486bb4ef00ad52e4f430da2a0085befd)

Places