Inline combine_two_samples (and remove an obsolete assert). Helps 13–14% on ResampleE...

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index b337788f4edaa328c1c5f1a00f2b6b4787ff6245..06cc6ab1de270cb1476a86fdc5f27832446788c0 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -109,17 +109,20 @@ public:
        // you will need to re-set it after this call.
        void set_width(unsigned width)
        {
+               assert(width != 0);
                this->pitch = this->width = width;
                invalidate_pixel_data();
        }
 
        void set_height(unsigned height)
        {
+               assert(height != 0);
                this->height = height;
                invalidate_pixel_data();
        }
 
        void set_pitch(unsigned pitch) {
+               assert(pitch != 0);
                this->pitch = pitch;
                invalidate_pixel_data();
        }
@@ -135,6 +138,10 @@ public:
        // NOTE: The input does not take ownership of this texture; you are responsible
        // for releasing it yourself. In particular, if you call invalidate_pixel_data()
        // or anything calling it, the texture will silently be removed from the input.
+       //
+       // NOTE: Doing this in a situation where can_output_linear_gamma() is true
+       // can yield unexpected results, as the downstream effect can expect the texture
+       // to be uploaded with the sRGB flag on.
        void set_texture_num(GLuint texture_num)
        {
                possibly_release_texture();