Make the ResampleEffect accuracy test stricter.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index b38728f05fa423061bb9002ce2bfb261ff73c4ff..74585d6d94dae0d3be0ed5fc1da119e8cfc1fc91 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1

 
 // High-quality image resizing, either up or down.
 //
 
 // High-quality image resizing, either up or down.
 //


@@ -15,8 +15,15 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 

+#include <GL/glew.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
+

 #include "effect.h"
 
 #include "effect.h"
 

+class EffectChain;
+class Node;

 class SingleResamplePassEffect;
 
 class ResampleEffect : public Effect {
 class SingleResamplePassEffect;
 
 class ResampleEffect : public Effect {


@@ -29,7 +36,6 @@ public:
        // down quite a lot.
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
        // down quite a lot.
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }

-       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }

 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 


@@ -63,6 +69,7 @@ public:
 
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }
 
        virtual bool needs_texture_bounce() const { return true; }
        virtual bool needs_srgb_primaries() const { return false; }

+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }

 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {


@@ -92,4 +99,4 @@ private:
        float slice_height;
 };
 
        float slice_height;
 };
 

-#endif // !defined(_RESAMPLE_EFFECT_H)
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)