Author: fredkiefer
Date: Sat Jun 4 22:36:46 2016
New Revision: 39838
URL: http://svn.gna.org/viewcvs/gnustep?rev=39838&view=rev
Log:
Extract protocol into private header file and use it from both places.
Added:
libs/gui/trunk/Source/NSBitmapImageRepPrivate.h
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSBitmapImageRep+PNG.m
libs/gui/trunk/Source/NSBitmapImageRep.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=39838&r1=39837&r2=39838&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sat Jun 4 22:36:46 2016
@@ -1,3 +1,10 @@
+2016-06-04 Fred Kiefer <[email protected]>
+
+ * 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 <[email protected]>
* 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 <[email protected]>
+2016-05-28 Eric Heintzmann <[email protected]>
* ChangeLog.1:
* Documentation/ReleaseNotes.gsdoc:
Modified: libs/gui/trunk/Source/NSBitmapImageRep+PNG.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRep%2BPNG.m?rev=39838&r1=39837&r2=39838&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRep+PNG.m (original)
+++ libs/gui/trunk/Source/NSBitmapImageRep+PNG.m Sat Jun 4 22:36:46 2016
@@ -55,6 +55,7 @@
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import "AppKit/NSGraphics.h"
+#import "NSBitmapImageRepPrivate.h"
#import "NSBitmapImageRep+PNG.h"
Modified: libs/gui/trunk/Source/NSBitmapImageRep.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRep.m?rev=39838&r1=39837&r2=39838&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRep.m (original)
+++ libs/gui/trunk/Source/NSBitmapImageRep.m Sat Jun 4 22:36:46 2016
@@ -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>
Added: libs/gui/trunk/Source/NSBitmapImageRepPrivate.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRepPrivate.h?rev=39838&view=auto
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRepPrivate.h (added)
+++ libs/gui/trunk/Source/NSBitmapImageRepPrivate.h Sat Jun 4 22:36:46 2016
@@ -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 <[email protected]>
+ 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
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
