[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit a81867e6676ac7a80b1eb194b3bcd6e2c5f95ae6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 4 22:06:04 2002 +0000

        Excluded call to new API until everyone has moved to >= 6C48.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9588ca7..6e25554 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
+    Excluded call to new API until everyone has moved to >= 6C48.
+    
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+	(-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+
+2002-06-04  Richard Williamson  <rjw at apple.com>
+
     Changes to support progressive image loading.  Currently disabled
     until 2945218 is fixed.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9588ca7..6e25554 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
+    Excluded call to new API until everyone has moved to >= 6C48.
+    
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+	(-[IFImageRenderer incrementalLoadWithBytes:length:complete:]):
+
+2002-06-04  Richard Williamson  <rjw at apple.com>
+
     Changes to support progressive image loading.  Currently disabled
     until 2945218 is fixed.
 
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 76b643b..124862d 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -18,13 +18,20 @@
 
 - (BOOL)incrementalLoadWithBytes: (const void *)bytes length:(unsigned)length complete:(BOOL)isComplete
 {
+
     NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
     //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
     NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
     int status;
     
     lastLength = length;
+// FIXME:  This won't compile unless you have > 6C48.
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
     lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
+#else
+    lastStatus = status = 0;
+    [NSException raise: @"TEMPORARY!!  This code will be removed." format: @"foo"];
+#endif
     [data release];
     switch (status){
     case NSImageRepLoadStatusUnknownType:       // not enough data to determine image format. please feed me more data
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 76b643b..124862d 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -18,13 +18,20 @@
 
 - (BOOL)incrementalLoadWithBytes: (const void *)bytes length:(unsigned)length complete:(BOOL)isComplete
 {
+
     NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
     //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
     NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
     int status;
     
     lastLength = length;
+// FIXME:  This won't compile unless you have > 6C48.
+#ifdef APPLE_PROGRESSIVE_IMAGE_LOADING
     lastStatus = status = [imageRep incrementalLoadFromData:data complete:isComplete];
+#else
+    lastStatus = status = 0;
+    [NSException raise: @"TEMPORARY!!  This code will be removed." format: @"foo"];
+#endif
     [data release];
     switch (status){
     case NSImageRepLoadStatusUnknownType:       // not enough data to determine image format. please feed me more data

-- 
WebKit Debian packaging