[ff-cvs] glmosaictext/include GLMosaicText.hxx glmosaict...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/glmosaictext
Module name:    glmosaictext
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/15 15:39:29

Modified files:
        include        : GLMosaicText.hxx 
        include/glmosaictext: Mosaic.hxx 

Log message:
        Whoops... forgot zero had been denied as texid, allow it to avoid crash

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/glmosaictext/glmosaictext/include/GLMosaicText.hxx.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/glmosaictext/glmosaictext/include/glmosaictext/Mosaic.hxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: glmosaictext/include/GLMosaicText.hxx
diff -u glmosaictext/include/GLMosaicText.hxx:1.5 
glmosaictext/include/GLMosaicText.hxx:1.6
--- glmosaictext/include/GLMosaicText.hxx:1.5   Fri Aug 15 14:38:52 2003
+++ glmosaictext/include/GLMosaicText.hxx       Fri Aug 15 15:39:29 2003
@@ -312,7 +312,8 @@
         */
        template<class TexBind> void endRendering(TexBind t) {
            glEnd();
-           t(Mosaic::Id()); // clear the bound texture - bind zero.
+           Mosaic::Id zero;
+           t(zero); // clear the bound texture - bind zero.
        }
 
     };
Index: glmosaictext/include/glmosaictext/Mosaic.hxx
diff -u glmosaictext/include/glmosaictext/Mosaic.hxx:1.2 
glmosaictext/include/glmosaictext/Mosaic.hxx:1.3
--- glmosaictext/include/glmosaictext/Mosaic.hxx:1.2    Tue Apr  8 16:22:22 2003
+++ glmosaictext/include/glmosaictext/Mosaic.hxx        Fri Aug 15 15:39:29 2003
@@ -86,7 +86,8 @@
        /** Cause OpenGL to bind this texture.
         */
        void bind(GLenum target = GL_TEXTURE_2D) const {
-           if(!id) throw InvalidTexture();
+           // No, it may be zero - it's allowed
+           // if(!id) throw InvalidTexture();
            glBindTexture(target, id);
        }
        void unbind(GLenum target = GL_TEXTURE_2D) const {