r19879 by craig - Fix gm memory command

[scribus-commit]

Author: craig
Date: Tue Feb 24 22:17:53 2015
New Revision: 19879

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19879
Log:
Fix gm memory command

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/util_formats.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19879&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Feb 24 22:17:53 2015
@@ -10585,8 +10585,7 @@
 void PageItem::moveWelded(double dX, double dY, int weld)
 {
 	WeldingInfo wInf = weldList.at(weld);
-	PageItem *item
-			= wInf.weldItem;
+	PageItem *item = wInf.weldItem;
 	item->setXPos(item->xPos() + dX);
 	item->setYPos(item->yPos() + dY);
 	item->update();

Modified: trunk/Scribus/scribus/util_formats.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19879&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp (original)
+++ trunk/Scribus/scribus/util_formats.cpp Tue Feb 24 22:17:53 2015
@@ -16,6 +16,7 @@
 #ifdef GMAGICK_FOUND
 #include <magick/api.h>
 #include <magick/magick.h>
+//#include <magick/memory.h>
 #include <magick/symbols.h>
 #endif
 
@@ -56,7 +57,7 @@
 			continue;
 		gmagickformats<<QString(magick_array[i]->name).toLower();
 	}
-	MagickFreeMemory(magick_array);
+	MagickFree(magick_array);
 	//qDebug()<<gmagickformats;
 	m_fmts.insert(FormatsManager::GMAGICK, gmagickformats);
 	//QStringList() << "xbm" << "tga" << "ptif" << "ppm" << "pnm" << "pgm" << "pcds" << "pcd" << "pbm" << "mng" << "ico" << "gif" << "fax" << "dpx" << "bmp" << "xcf");