File gdal-upstream-issue#6898-changeset#38636.patch of Package gdal

Overview Repositories Revisions Requests Users Attributes Meta

File gdal-upstream-issue#6898-changeset#38636.patch of Package gdal (Revision 27ff08842969fa2fdfff38c1e547242d)

Currently displaying revision 27ff08842969fa2fdfff38c1e547242d , Show latest

Index: swig/include/perl/band.i
===================================================================
--- a/swig/include/perl/band.i	(revision 38635)
+++ b/swig/include/perl/band.i	(revision 38636)
@@ -4,5 +4,5 @@
   double NVClassify(int comparison, double nv, AV* classifier, const char **error) {
      /* recursive, return nv < classifier[0] ? classifier[1] : classifier[2]
-        returns error if there are not three values in the classifier,
+        sets error if there are not three values in the classifier,
         first is not a number, or second or third are not a number of arrayref
      */
@@ -33,16 +33,13 @@
          else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV))
              return NVClassify(comparison, nv, (AV*)(SvRV(*t)), error);
-         else {
+         else
              *error = "The decision in a classifier must be a number or a reference to a classifier.";
-             return 0;
-         }
-     } else {
+     } else
          *error = "The first value in a classifier must be a number.";
-         return 0;
-     }
+     return 0;
   }
   void NVClass(int comparison, double nv, AV* classifier, int *klass, const char **error) {
-     /* recursive, return nv < classifier[0] ? classifier[1] : classifier[2]
-        returns NULL if there are not three values in the classifier,
+     /* recursive, return in klass nv < classifier[0] ? classifier[1] : classifier[2]
+        sets error if there are not three values in the classifier,
         first is not a number, or second or third are not a number of arrayref
      */
@@ -78,12 +75,8 @@
          else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV))
              NVClass(comparison, nv, (AV*)(SvRV(*t)), klass, error);
-         else {
+         else
              *error = "The decision in a classifier must be a number or a reference to a classifier.";
-             return;
-         }
-     } else {
+     } else
          *error = "The first value in a classifier must be a number.";
-         return;
-     }
   }
   AV* to_array_classifier(SV* classifier, int* comparison, const char **error) {
@@ -101,6 +94,8 @@
               else if (strcmp(c, ">=") == 0)
                   *comparison = 3;
-              else
+              else {
                   *error = "The first element in classifier object must be a comparison.";
+                  return NULL;
+              }
           }
           if (s && SvROK(*s) && (SvTYPE(SvRV(*s)) == SVt_PVAV))
@@ -108,7 +103,7 @@
           else
               *error = "The second element in classifier object must be an array reference.";
-      } else {
+      } else
           *error = NEED_ARRAY_REF;
-      }
+      return NULL;
   }
 %}

Places

File gdal-upstream-issue#6898-changeset#38636.patch of Package gdal (Revision 27ff08842969fa2fdfff38c1e547242d)

Places