revert mods made for HDR for out-of-range values greater than (0 - 1.0f)

diff --git a/cinelerra-5.1/cinelerra/overlayframe.h b/cinelerra-5.1/cinelerra/overlayframe.h
index 4775e8df0004c9f5c2c529c37b779b3b31a7be0a..13c2e4bd0b26b0b5994eea343e02bdd8a4c074be 100644 (file)
--- a/cinelerra-5.1/cinelerra/overlayframe.h
+++ b/cinelerra-5.1/cinelerra/overlayframe.h
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <float.h>
 
 #define DIRECT_COPY 0
 #define BILINEAR 1
@@ -238,7 +237,7 @@ static inline int64_t aclip(int64_t v, int mx) {
        return v < 0 ? 0 : v > mx ? mx : v;
 }
 static inline float   aclip(float v, float mx) {
-       return v < -FLT_MAX+1 ? -FLT_MAX : v > FLT_MAX-1 ? FLT_MAX : v;
+       return v < 0 ? 0 : v > mx ? mx : v;
 }
 static inline float   aclip(float v, int mx) {
        return v < 0 ? 0 : v > mx ? mx : v;

diff --git a/cinelerra-5.1/plugins/color3way/color3way.C b/cinelerra-5.1/plugins/color3way/color3way.C
index 417b74510987e6bae051f892ce466e0f2e0df2c2..7685257b9c21d3e318b8b4a4bbd3f0f8a3c9c7aa 100644 (file)
--- a/cinelerra-5.1/plugins/color3way/color3way.C
+++ b/cinelerra-5.1/plugins/color3way/color3way.C
@@ -278,10 +278,10 @@ void Color3WayUnit::process_package(LoadPackage *package)
                                PROCESS(unsigned char, 0xff, 4, 1)
                                break;
                        case BC_RGB_FLOAT:
-                               PROCESS(float, 100.0, 3, 0)
+                               PROCESS(float, 1.0, 3, 0)
                                break;
                        case BC_RGBA_FLOAT:
-                               PROCESS(float, 100.0, 4, 0)
+                               PROCESS(float, 1.0, 4, 0)
                                break;
                }
        }

diff --git a/cinelerra-5.1/plugins/histogram/histogram.C b/cinelerra-5.1/plugins/histogram/histogram.C
index 4b55f429aaa63a2cb1ae9b78cb7068153c7f8dba..c78c3c7c44eb3b44c547de8f81059dd7f4ba7b68 100644 (file)
--- a/cinelerra-5.1/plugins/histogram/histogram.C
+++ b/cinelerra-5.1/plugins/histogram/histogram.C
@@ -234,7 +234,7 @@ float HistogramMain::calculate_level(float input, int mode, int use_value)
 
        if( !EQUIV(config.gamma[mode], 0) ) {
                output = pow(output, 1.0 / config.gamma[mode]);
-               CLAMP(output, 0, 100.0);
+               CLAMP(output, 0, 1.0);
        }
 
 // Apply value curve