Author: fredkiefer
Date: Thu May 28 23:44:19 2015
New Revision: 38581
URL: http://svn.gna.org/viewcvs/gnustep?rev=38581&view=rev
Log:
* Source/NSBitmapImageRep+GIF.m: Handle EGifOpen similar to
other version specific functions.
* Headers/Additions/GNUstepGUI/GSXibElement.h
* Headers/Additions/GNUstepGUI/GSXibLoading.h
* Headers/Additions/GNUstepGUI/GSXibObjectContainer.h
* Headers/Additions/GNUstepGUI/GSXibParser.h
Correct FSF address.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibElement.h
libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibLoading.h
libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibObjectContainer.h
libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibParser.h
libs/gui/trunk/Source/NSBitmapImageRep+GIF.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Thu May 28 23:44:19 2015
@@ -1,4 +1,14 @@
-2015-05-26: Sebastian Reitenbach <[email protected]>
+2015-05-28 Fred Kiefer <[email protected]>
+
+ * Source/NSBitmapImageRep+GIF.m: Handle EGifOpen similar to other
+ version specific functions.
+ * Headers/Additions/GNUstepGUI/GSXibElement.h
+ * Headers/Additions/GNUstepGUI/GSXibLoading.h
+ * Headers/Additions/GNUstepGUI/GSXibObjectContainer.h
+ * Headers/Additions/GNUstepGUI/GSXibParser.h
+ Correct FSF address.
+
+2015-05-26 Sebastian Reitenbach <[email protected]>
* Source/NSView.m
* Source/NSTextContainer.m
@@ -19,10 +29,13 @@
* Source/NSSplitView.m
* Model/GMArchiver.m
* TextConverters/RTF/RTFConsumer.m
- Format string fixes and casts
+ Format string fixes and casts
* Source/NSGradient.m
* Source/NSWindow.m
abs() -> fabs()
+ * Source/NSBitmapImageRep+GIF.m
+ giflib 5.1.0 also has EGifCloseFile with 2 parameters,
+ so add a define like others have to fix its usage.
2015-05-22 Fred Kiefer <[email protected]>
Modified: libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibElement.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibElement.h?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibElement.h (original)
+++ libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibElement.h Thu May 28
23:44:19 2015
@@ -9,21 +9,23 @@
Refactored slightly by: Gregory Casamento <[email protected]>
Created: May 2010
- This file is part of the GNUstep Base Library.
+ 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 Library General Public
+ 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
- Library General Public License for more details.
+ 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 Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 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.
*/
#ifndef _GNUstep_H_GSXibElement
Modified: libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibLoading.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibLoading.h?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibLoading.h (original)
+++ libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibLoading.h Thu May 28
23:44:19 2015
@@ -9,21 +9,23 @@
Refactored slightly by: Gregory Casamento <[email protected]>
Created: May 2010
- This file is part of the GNUstep Base Library.
+ 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 Library General Public
+ 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
- Library General Public License for more details.
+ 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 Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 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.
*/
#ifndef _GNUstep_H_GSXibLoading
Modified: libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibObjectContainer.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibObjectContainer.h?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibObjectContainer.h
(original)
+++ libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibObjectContainer.h Thu May
28 23:44:19 2015
@@ -7,21 +7,23 @@
Written by: Gregory Casamento <[email protected]>
Created: March 2014
- This file is part of the GNUstep Base Library.
+ 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 Library General Public
+ 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
- Library General Public License for more details.
+ 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 Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 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.
*/
#ifndef _GNUstep_H_GSXibObjectContainer
Modified: libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibParser.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibParser.h?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibParser.h (original)
+++ libs/gui/trunk/Headers/Additions/GNUstepGUI/GSXibParser.h Thu May 28
23:44:19 2015
@@ -7,21 +7,23 @@
Written by: Gregory Casamento <[email protected]>
Created: March 2014
- This file is part of the GNUstep Base Library.
+ 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 Library General Public
+ 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
- Library General Public License for more details.
+ 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 Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 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.
*/
#ifndef _GNUstep_H_GSXibParser
Modified: libs/gui/trunk/Source/NSBitmapImageRep+GIF.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRep%2BGIF.m?rev=38581&r1=38580&r2=38581&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRep+GIF.m (original)
+++ libs/gui/trunk/Source/NSBitmapImageRep+GIF.m Thu May 28 23:44:19 2015
@@ -59,6 +59,7 @@
// GIF > 5.0
#if GIFLIB_MAJOR >= 5
#define DGifOpen(s, i) DGifOpen(s, i, NULL)
+ #define EGifOpen(s, i) EGifOpen(s, i, NULL)
#endif
// GIF> 5.1
@@ -529,11 +530,8 @@
free(GIFImage);
return nil;
}
-#if GIFLIB_MAJOR >= 5
- GIFFile = EGifOpen(GIFRep, gs_gif_output, NULL);
-#else
+
GIFFile = EGifOpen(GIFRep, gs_gif_output);
-#endif
status = EGifPutScreenDesc(GIFFile, width, height, 8, 0, NULL);
if (status == GIF_ERROR)
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
