Improvement for pfm_in, and a bug fix for handling signed pfm data.

aous72 · Sep 20, 2024 · 7b0f5c8 · 7b0f5c8
1 parent 9f8011c
commit 7b0f5c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/apps/others/ojph_img_io.cpp b/src/apps/others/ojph_img_io.cpp
@@ -660,7 +660,7 @@ namespace ojph {
  if (shift)
  for (ui32 i = width; i > 0; --i, sp += num_comps) 
  {
- ui32 v = *(ui32*)sp;
+ si32 v = *(si32*)sp;
  v >>= shift;
  *dp++ = *(float*)&v;
  }
@@ -675,8 +675,9 @@ namespace ojph {
  if (shift)
  for (ui32 i = width; i > 0; --i, sp += num_comps) {
  ui32 v = be2le(*(ui32*)sp);
- v >>= shift;
- *dp++ = *(float*)&v;
+ si32 u = *(si32*)&v;
+ u >>= shift;
+ *dp++ = *(float*)&u;
  }
  else
  for (ui32 i = width; i > 0; --i, sp += num_comps) {

diff --git a/src/core/transform/ojph_colour.cpp b/src/core/transform/ojph_colour.cpp
@@ -214,7 +214,7 @@ namespace ojph {
  {
  for (ui32 i = width; i > 0; --i) {
  const si32 v = *sp++;
- *dp++ = v > 0 ? v : (- v - shift);
+ *dp++ = v >= 0 ? v : (- v - shift);
  }
  }