Use NULL instead of png_voidp_NULL.

[movit] / util.h

diff --git a/util.h b/util.h
index 432171ac015d3fd5921b5eb9fe9c0ccffd92b9b3..8917dd3cf9e039c4ead7008d7d0a162af54d24ee 100644 (file)
--- a/util.h
+++ b/util.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <Eigen/Core>
 
-#include "opengl.h"
+#include <GL/glew.h>
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
@@ -36,19 +36,12 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 
 // Calculate where to sample, and with what weight, if one wants to use
 // the GPU's bilinear hardware to sample w1 * x[0] + w2 * x[1].
-static inline void combine_two_samples(float w1, float w2, float *offset, float *total_weight)
-{
-       assert(w1 * w2 >= 0.0f);  // Should not have differing signs.
-       if (fabs(w1 + w2) < 1e-6) {
-               *offset = 0.5f;
-               *total_weight = 0.0f;
-       } else {
-               *offset = w2 / (w1 + w2);
-               *total_weight = w1 + w2;
-       }
-       assert(*offset >= 0.0f);
-       assert(*offset <= 1.0f);
-}
+//
+// Note that since the GPU might have limited precision in its linear
+// interpolation, the effective weights might be different from the ones you
+// asked for. sum_sq_error, if not NULL, will contain the sum of the
+// (estimated) squared errors of the two weights.
+void combine_two_samples(float w1, float w2, float *offset, float *total_weight, float *sum_sq_error);
 
 #ifdef NDEBUG
 #define check_error()
@@ -56,4 +49,17 @@ static inline void combine_two_samples(float w1, float w2, float *offset, float
 #define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); exit(1); } }
 #endif
 
+#ifdef __GNUC__
+#define MUST_CHECK_RESULT __attribute__((warn_unused_result))
+#else
+#define MUST_CHECK_RESULT 
+#endif
+
+// CHECK() is like assert(), but retains any side effects no matter the compilation mode.
+#ifdef NDEBUG
+#define CHECK(x) (void)(x)
+#else
+#define CHECK(x) do { bool ok = x; if (!ok) { fprintf(stderr, "%s:%d: %s: Assertion `%s' failed.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #x); abort(); } } while (false)
+#endif
+
 #endif // !defined(_UTIL_H)