Extract protocol into private header file and use it from both places.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39838 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,10 @@
+2016-06-04 Fred Kiefer <FredKiefer@gmx.de>
+
+        * Source/NSBitmapImageRepPrivate.h,
+        * Source/NSBitmapImageRep.m,
+        * Source/NSBitmapImageRep+PNG.m:
+	Extract protocol into private header file and use it from both places.
+
 2016-06-03  Yavor Doganov  <yavor@gnu.org>
 
 	* Documentation/GSSpeechServer.1:
@@ -25,7 +32,7 @@
 	Fixed faulty character encoding (should be utf-8) and a couple of
 	documentation markmup errors.
 
-2016-05-28 Eric Heintzmann <heintzmann.eric@free.fr> 
+2016-05-28 Eric Heintzmann <heintzmann.eric@free.fr>
 
 	* ChangeLog.1:
 	* Documentation/ReleaseNotes.gsdoc:

Source/NSBitmapImageRep+PNG.m

@@ -55,6 +55,7 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 #import "AppKit/NSGraphics.h"
+#import "NSBitmapImageRepPrivate.h"
 #import "NSBitmapImageRep+PNG.h"
 
 

Source/NSBitmapImageRep.m

@@ -51,6 +51,7 @@
 #import "NSBitmapImageRep+PNG.h"
 #import "NSBitmapImageRep+PNM.h"
 #import "NSBitmapImageRep+ICNS.h"
+#import "NSBitmapImageRepPrivate.h"
 #import "GSGuiPrivate.h"
 
 #include "nsimage-tiff.h"
@@ -58,31 +59,6 @@
 /* Maximum number of planes */
 #define MAX_PLANES 5
 
-/* Backend methods (optional) */
-@interface NSBitmapImageRep (GSPrivate)
-// GNUstep extension
-+ (BOOL) _bitmapIsTIFF: (NSData *)data;
-+ (NSArray*) _imageRepsWithTIFFData: (NSData *)imageData;
-- (NSBitmapImageRep *) _initBitmapFromTIFF: (NSData *)imageData;
-- (NSBitmapImageRep *) _initFromTIFFImage: (TIFF *)image number: (int)imageNumber;
-- (void) _fillTIFFInfo: (NSTiffInfo*)info
-      usingCompression: (NSTIFFCompression)type
-                factor: (float)factor;
-
-// Internal
-+ (int) _localFromCompressionType: (NSTIFFCompression)type;
-+ (NSTIFFCompression) _compressionTypeFromLocal: (int)type;
-- (void) _premultiply;
-- (void) _unpremultiply;
-- (NSBitmapImageRep *) _convertToFormatBitsPerSample: (NSInteger)bps
-                                     samplesPerPixel: (NSInteger)spp
-                                            hasAlpha: (BOOL)alpha
-                                            isPlanar: (BOOL)isPlanar
-                                      colorSpaceName: (NSString*)colorSpaceName
-                                        bitmapFormat: (NSBitmapFormat)bitmapFormat 
-                                         bytesPerRow: (NSInteger)rowBytes
-                                        bitsPerPixel: (NSInteger)pixelBits;
-@end
 
 /**
   <unit>

Source/NSBitmapImageRepPrivate.h

@@ -0,0 +1,54 @@
+/** <title>NSBitmapImageRepPrivate.h</title>
+
+   <abstract>The private methods of the NSBitmapImageRep classes.</abstract>
+
+   Copyright (C) 2016 Free Software Foundation, Inc.
+   
+   Author:  Fred Kiefer <fredkiefer@gmx.de>
+   Date: Jun 2016
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, see <http://www.gnu.org/licenses/> or write to the 
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301, USA.
+*/
+#import "AppKit/NSBitmapImageRep.h"
+#include "nsimage-tiff.h"
+
+@interface NSBitmapImageRep (GSPrivate)
+// GNUstep extension
++ (BOOL) _bitmapIsTIFF: (NSData *)data;
++ (NSArray*) _imageRepsWithTIFFData: (NSData *)imageData;
+- (NSBitmapImageRep *) _initBitmapFromTIFF: (NSData *)imageData;
+- (NSBitmapImageRep *) _initFromTIFFImage: (TIFF *)image number: (int)imageNumber;
+- (void) _fillTIFFInfo: (NSTiffInfo*)info
+      usingCompression: (NSTIFFCompression)type
+                factor: (float)factor;
+
+// Internal
++ (int) _localFromCompressionType: (NSTIFFCompression)type;
++ (NSTIFFCompression) _compressionTypeFromLocal: (int)type;
+- (void) _premultiply;
+- (void) _unpremultiply;
+- (NSBitmapImageRep *) _convertToFormatBitsPerSample: (NSInteger)bps
+                                     samplesPerPixel: (NSInteger)spp
+                                            hasAlpha: (BOOL)alpha
+                                            isPlanar: (BOOL)isPlanar
+                                      colorSpaceName: (NSString*)colorSpaceName
+                                        bitmapFormat: (NSBitmapFormat)bitmapFormat 
+                                         bytesPerRow: (NSInteger)rowBytes
+                                        bitsPerPixel: (NSInteger)pixelBits;
+@end