Changeset e070dc0 in sasview for src/sas/sascalc

Timestamp:

Aug 8, 2016 9:30:53 AM (8 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

9b7c596

Message:

Raise error if error reading binary file instead of crashing

File:

• src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) (4 diffs)

src/sas/sascalc/file_converter/c_ext/bsl_loader.c

@@ -141 +141 @@
 /*                        ----- Instance Methods -----                       */
 
-float reverse_float(const float in_float){
+float reverse_float(const float in_float) {
+    // Reverse the order of the bytes of a float
     float retval;
     char *to_convert = (char *)&in_float;
@@ -163 +164 @@
     PyArrayObject *data;
 
+    // Create a new numpy array to store the data in
     data = (PyArrayObject *)PyArray_SimpleNew(2, size, NPY_FLOAT);
 
+    // Attempt to open the file specified
     input_file = fopen(self->params.filename, "rb");
     if (!input_file) {
@@ -170 +173 @@
     }
 
+    // Move the file cursor the the position where the data we're interested
+    // in begins
     frame_pos = self->params.n_pixels * self->params.n_rasters * self->params.frame;
     fseek(input_file, frame_pos*sizeof(float), SEEK_SET);
@@ -175 +180 @@
     for (raster = 0; raster < self->params.n_rasters; raster++) {
         for (pixel = 0; pixel < self->params.n_pixels; pixel++) {
-            fread(&cur_val, sizeof(float), 1, input_file);
+            // Try reading the file
+            if (fread(&cur_val, sizeof(float), 1, input_file) == 0) {
+                PyErr_SetString(PyExc_RuntimeError, "Error reading file or EOF reached.");
+                return NULL;
+            }
+
+            // Swap the order of the bytes read, if specified that we should do
+            // so in the header file
             if (self->params.swap_bytes == 0)
                 cur_val = reverse_float(cur_val);
+
+            // Add the read value to the numpy array
             PyArray_SETITEM(data, PyArray_GETPTR2(data, raster, pixel), PyFloat_FromDouble(cur_val));
         }