further fix to pfmFile.resize()

drwrose · drwrose · commit 41fa3c52e3f7 · 2019-10-18T12:50:52.000-07:00
diff --git a/panda/src/pnmimage/pnm-image-filter-sparse-core.cxx b/panda/src/pnmimage/pnm-image-filter-sparse-core.cxx
@@ -69,7 +69,6 @@ FUNCTION_NAME(IMAGETYPE &dest, const IMAGETYPE &source,
                       filter, filter_width, actual_width);
 
     for (a = 0; a < dest.ASIZE(); a++) {
-      nassertv(!isnan(temp_dest[a]) && !isnan(temp_dest_weight[a]));
       matrix[a][b] = temp_dest[a];
       matrix_weight[a][b] = temp_dest_weight[a];
     }
@@ -95,10 +94,10 @@ FUNCTION_NAME(IMAGETYPE &dest, const IMAGETYPE &source,
                       filter, filter_width, actual_width);
 
     for (b = 0; b < dest.BSIZE(); b++) {
-      nassertv(!isnan(temp_dest[b]) && !isnan(temp_dest_weight[b]));
       if (temp_dest_weight[b] != 0) {
-        dest.SETVAL(a, b, channel, (float)temp_dest[b]/(float)temp_dest_weight[b]);
-        nassertv(!isnan(dest.GETVAL(a, b, channel)));
+        // The temp_dest array has already been scaled by
+        // temp_dest_weight; we don't scale it again here.
+        dest.SETVAL(a, b, channel, (float)temp_dest[b]/(float)source_max);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ FUNCTION_NAME(IMAGETYPE &dest, const IMAGETYPE &source,`
`69`	`69`	`filter, filter_width, actual_width);`
`70`	`70`
`71`	`71`	`for (a = 0; a < dest.ASIZE(); a++) {`
`72`		`- nassertv(!isnan(temp_dest[a]) && !isnan(temp_dest_weight[a]));`
`73`	`72`	`matrix[a][b] = temp_dest[a];`
`74`	`73`	`matrix_weight[a][b] = temp_dest_weight[a];`
`75`	`74`	`}`
`@@ -95,10 +94,10 @@ FUNCTION_NAME(IMAGETYPE &dest, const IMAGETYPE &source,`
`95`	`94`	`filter, filter_width, actual_width);`
`96`	`95`
`97`	`96`	`for (b = 0; b < dest.BSIZE(); b++) {`
`98`		`- nassertv(!isnan(temp_dest[b]) && !isnan(temp_dest_weight[b]));`
`99`	`97`	`if (temp_dest_weight[b] != 0) {`
`100`		`- dest.SETVAL(a, b, channel, (float)temp_dest[b]/(float)temp_dest_weight[b]);`
`101`		`- nassertv(!isnan(dest.GETVAL(a, b, channel)));`
	`98`	`+ // The temp_dest array has already been scaled by`
	`99`	`+ // temp_dest_weight; we don't scale it again here.`
	`100`	`+ dest.SETVAL(a, b, channel, (float)temp_dest[b]/(float)source_max);`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`	`}`