diff --git a/ChangeLog b/ChangeLog index 602caf9e6..21a03317a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Willem Rein Oudshoorn + + * gui/Source/NSImage.m ([NSImage -initWithSize:]): round the size down + ([NSImage -setSize:]): round the size down + Tue Jan 29 10:59:04 2002 Nicola Pero * GNUmakefile.postamble (configure): Rule removed. It was causing diff --git a/Documentation/gsdoc/NSAttributedStrngAdds.gsdoc b/Documentation/gsdoc/NSAttributedStrngAdds.gsdoc deleted file mode 100644 index a12bf3f46..000000000 --- a/Documentation/gsdoc/NSAttributedStrngAdds.gsdoc +++ /dev/null @@ -1,23 +0,0 @@ - - - - - NSAttributedStrngAdds - - - - - $Revision$ - $Date$ - - - - NSAttributedStrngAdds - - Gui/NSApplication.h - - - - - - diff --git a/Documentation/gsdoc/NSAttributedStrngAdds.html b/Documentation/gsdoc/NSAttributedStrngAdds.html deleted file mode 100644 index 0bd83720b..000000000 --- a/Documentation/gsdoc/NSAttributedStrngAdds.html +++ /dev/null @@ -1,30 +0,0 @@ - - NSAttributedStrngAdds - - -[Previous] -[Up] -[Next] -

NSAttributedStrngAdds

-

Authors

-
-
Richard Frith-Macdonald -
-
-

Version: $Revision$

-

Date: $Date$

-

NSAttributedStrngAdds

-

NSAttributedStrngAdds

-

Declared in: Gui/NSApplication.h

-
- - -

Instance Variables

- -

Methods

- - - - diff --git a/Source/NSImage.m b/Source/NSImage.m index d325063ca..f38f65716 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -289,7 +289,12 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) //_flags.flipDraw = NO; if (aSize.width && aSize.height) { - _size = aSize; + // FIXME: rounding down is just a quick fix. + // the non-integrality of the image should be + // taken care of in the composite methods in + // the backend. + _size.width = (int) aSize.width; + _size.height = (int) aSize.height; _flags.sizeWasExplicitlySet = YES; } //_flags.usesEPSOnResolutionMismatch = NO; @@ -488,7 +493,12 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) - (void) setSize: (NSSize)aSize { - _size = aSize; + // FIXME: the rounding down is just a quick fix + // it should actually be handled in composite in + // the backend. + _size.width = (int) aSize.width; + _size.height = (int) aSize.height; + _flags.sizeWasExplicitlySet = YES; // TODO: This invalidates any cached data } @@ -680,7 +690,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) aRect.origin.x += rect.origin.x; aRect.origin.y += rect.origin.y; rect = NSIntersectionRect(aRect, rect); - + PScomposite(NSMinX(rect), NSMinY(rect), NSWidth(rect), NSHeight(rect), [[(NSCachedImageRep *)rep window] gState], aPoint.x, y, op); }