Difference for 2d/bitmap.c from version 1.5 to 1.6


version 1.5 version 1.6
Line 19
 
Line 19
  * Graphical routines for manipulating grs_bitmaps.   * Graphical routines for manipulating grs_bitmaps.
  *   *
  * $Log$   * $Log$
    * Revision 1.6  1999/10/07 20:48:17  donut
    * ogl fix for sub bitmaps and segv
    *
  * Revision 1.5  1999/10/07 02:27:14  donut   * Revision 1.5  1999/10/07 02:27:14  donut
  * OGL includes to remove warnings   * OGL includes to remove warnings
  *   *
Line 176
 
Line 179
  bm->pvSurface = NULL;   bm->pvSurface = NULL;
 #endif  #endif
 #ifdef OGL  #ifdef OGL
  ogl_freebmtexture(bm);  // ogl_freebmtexture(bm);//not what we want here.
    bm->gltexture=NULL;
 #endif  #endif
 }  }
   
Line 215
 
Line 219
  bm->bm_type = bmParent->bm_type;   bm->bm_type = bmParent->bm_type;
  bm->bm_rowsize = bmParent->bm_rowsize;   bm->bm_rowsize = bmParent->bm_rowsize;
   
   #ifdef OGL
    bm->gltexture=bmParent->gltexture;
   #endif
 #ifdef D1XD3D  #ifdef D1XD3D
  Assert (bmParent->iMagic == BM_MAGIC_NUMBER);   Assert (bmParent->iMagic == BM_MAGIC_NUMBER);
  bm->iMagic = BM_MAGIC_NUMBER;   bm->iMagic = BM_MAGIC_NUMBER;

Legend:
line(s) removed in v.1.5 
line(s) changed
 line(s) added in v.1.6