remove workaround

[wxWidgets.git] / src / osx / core / glgrab.cpp

diff --git a/src/osx/core/glgrab.cpp b/src/osx/core/glgrab.cpp
index a3ab6634751f2d8543ace3b5ba012688ac55379f..ccb2ff76ad51cc6b99e182d2a8fe64fe01fa8d0b 100644 (file)
--- a/src/osx/core/glgrab.cpp
+++ b/src/osx/core/glgrab.cpp
@@ -3,7 +3,7 @@
  consideration of your agreement to the following terms, and your use, installation or modification
  of this Apple software constitutes acceptance of these terms. If you do not agree with these terms,
  please do not use, install or modify this Apple software.
- 
+
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple\xd5s copyrights in
  this original Apple software (the "Apple Software"), to use and modify the Apple Software,
@@ -16,12 +16,12 @@
  licenses, express or implied, are granted by Apple herein, including but not limited
  to any patent rights that may be infringed by your derivative works or by other works
  in which the Apple Software may be incorporated.
- 
+
  The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
  EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
  USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- 
+
  IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
@@ -54,20 +54,20 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
     void * topP;
     void * bottomP;
     void * base;
-    
-    
+
+
     top = 0;
     bottom = height - 1;
     base = data;
     buffer = malloc(rowBytes);
-    
-    
+
+
     while ( top < bottom )
     {
         topP = (void *)((top * rowBytes) + (intptr_t)base);
         bottomP = (void *)((bottom * rowBytes) + (intptr_t)base);
-        
-        
+
+
         /*
          * Save and swap scanlines.
          *
@@ -78,7 +78,7 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
         bcopy( topP, buffer, rowBytes );
         bcopy( bottomP, topP, rowBytes );
         bcopy( buffer, bottomP, rowBytes );
-        
+
         ++top;
         --bottom;
     }
@@ -102,7 +102,7 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
  * using CFRelease().
  * Returns NULL on an error.
  */
-  
+
 CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
 {
     CGContextRef bitmap;
@@ -111,7 +111,7 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     long bytewidth;
     GLint width, height;
     long bytes;
-    
+
     CGLContextObj    glContextObj;
     CGLPixelFormatObj pixelFormatObj ;
     GLint numPixelFormats ;
@@ -122,13 +122,13 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
         (CGLPixelFormatAttribute) 0,    /* Display mask bit goes here */
         (CGLPixelFormatAttribute) 0
     } ;
-    
-    
+
+
     if ( display == kCGNullDirectDisplay )
         display = CGMainDisplayID();
     attribs[2] = (CGLPixelFormatAttribute) CGDisplayIDToOpenGLDisplayMask(display);
-    
-    
+
+
     /* Build a full-screen GL context */
     CGLChoosePixelFormat( attribs, &pixelFormatObj, &numPixelFormats );
     if ( pixelFormatObj == NULL )    // No full screen context support
@@ -137,23 +137,23 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     CGLDestroyPixelFormat( pixelFormatObj ) ;
     if ( glContextObj == NULL )
         return NULL;
-    
-    
+
+
     CGLSetCurrentContext( glContextObj ) ;
     CGLSetFullScreen( glContextObj ) ;
-    
-    
+
+
     glReadBuffer(GL_FRONT);
-    
-    
+
+
     width = (GLint)srcRect.size.width;
     height = (GLint)srcRect.size.height;
-    
-    
+
+
     bytewidth = width * 4; // Assume 4 bytes/pixel for now
     bytewidth = (bytewidth + 3) & ~3; // Align to 4 bytes
     bytes = bytewidth * height; // width * height
-    
+
     /* Build bitmap context */
     data = malloc(height * bytewidth);
     if ( data == NULL )
@@ -165,15 +165,15 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     }
     bitmap = CGBitmapContextCreate(data, width, height, 8, bytewidth,
                                    wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst /* XRGB */);
-    
-    
+
+
     /* Read framebuffer into our bitmap */
     glFinish(); /* Finish all OpenGL commands */
     glPixelStorei(GL_PACK_ALIGNMENT, 4); /* Force 4-byte alignment */
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_SKIP_ROWS, 0);
     glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
-    
+
     /*
      * Fetch the data in XRGB format, matching the bitmap context.
      */
@@ -193,21 +193,21 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
      * invert it. Pixel reformatting can also be done here.
      */
     swizzleBitmap(data, bytewidth, height);
-    
-    
+
+
     /* Make an image out of our bitmap; does a cheap vm_copy of the bitmap */
     image = CGBitmapContextCreateImage(bitmap);
-    
+
     /* Get rid of bitmap */
     CFRelease(bitmap);
     free(data);
-    
-    
+
+
     /* Get rid of GL context */
     CGLSetCurrentContext( NULL );
     CGLClearDrawable( glContextObj ); // disassociate from full screen
     CGLDestroyContext( glContextObj ); // and destroy the context
-    
+
     /* Returned image has a reference count of 1 */
     return image;
 }