Changeset 3041 for trunk/src

Timestamp:

07/27/15 18:44:50 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-7743

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Better handling of large number that exceeds a limit of uInt (unsigned int) and proper handling of possible memory allocation error.

File:

• trunk/src/GenericEdgeDetector.cpp (modified) (4 diffs)

trunk/src/GenericEdgeDetector.cpp

@@ -11 +11 @@
 //
 #include <math.h>
+#include <limits.h>
+#include <stdint.h>
 
 #include <casa/Arrays/Vector.h>
@@ -167 +169 @@
   dx_ = dy_ / decCorr ;
 
-  nx_ = uInt( ceil( wx / dx_ ) ) ;
-  ny_ = uInt( ceil( wy / dy_ ) ) ;
+  Double nxTemp = ceil(wx / dx_);
+  Double nyTemp = ceil(wy / dy_);
+  if (nxTemp > (Double)UINT_MAX || nyTemp > (Double)UINT_MAX) {
+          throw AipsError("Error in setup: Too large number of pixels.");
+  }
+  nx_ = uInt( nxTemp ) ;
+  ny_ = uInt( nyTemp ) ;
 
   pcenx_ = 0.5 * Double( nx_ - 1 ) ;
@@ -186 +193 @@
   os_.origin(LogOrigin( "GenericEdgeDetector", "countup", WHERE )) ;
 
-  uInt *a_p = new uInt[nx_*ny_] ;
-  apix_.takeStorage( IPosition(2,nx_,ny_), a_p, TAKE_OVER ) ;
+  try {
+          size_t n = (size_t)nx_ * (size_t)ny_;
+          uInt *a_p = new uInt[n] ;
+          apix_.takeStorage( IPosition(2,nx_,ny_), a_p, TAKE_OVER ) ;
+  }
+  catch (std::bad_alloc const &e) {
+          os_ << LogIO::SEVERE << "Failed to allocate working array" << LogIO::POST;
+          throw e;
+  }
+  catch (...) {
+          os_ << LogIO::SEVERE << "Failed due to unknown error" << LogIO::POST;
+          throw;
+  }
   apix_ = 0 ;
   
@@ -198 +216 @@
   const Double *py_p = pdir_p + 1 ;
   long offset ;
+  // apix_ is always contiguous
+  uInt *a_p = apix_.data();
   for ( uInt i = 0 ; i < len ; i++ ) {
     ix = uInt(round( *px_p )) ;