r23387 by jghali - Revert r23378: patch should not have been committed as the added function only returns dummy data

scribus-commit scribus-commit at lists.scribus.net
Fri Nov 29 12:18:10 UTC 2019


Author: jghali
Date: Fri Nov 29 12:18:10 2019
New Revision: 23387

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23387
Log:
Revert r23378: patch should not have been committed as the added function only returns dummy data

Modified:
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23387&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	Fri Nov 29 12:18:10 2019
@@ -253,28 +253,6 @@
 	if (item == nullptr)
 		return nullptr;
 	return Py_BuildValue("(ff)", item->imageXScale() / 72.0 * item->pixm.imgInfo.xres, item->imageYScale() / 72.0 * item->pixm.imgInfo.yres);
-}
-
-PyObject *scribus_getimageexiffield(PyObject* /* self */, PyObject* args)
-{
-	char *Name = const_cast<char*>("");
-	char *Field;
-	if (!PyArg_ParseTuple(args, "es|es", &Field, "utf-8", &Name))
-		return nullptr;
-	if (!checkHaveDocument())
-		return nullptr;
-	PageItem *item = GetUniqueItem(QString::fromUtf8(Name));
-	if (item == nullptr)
-		return nullptr;
-	if (item->itemType() != PageItem::ImageFrame)
-		return nullptr;
-
-	// ImageInfoDialog *dia = new ImageInfoDialog(this, &pageItem->pixm.imgInfo);
-	// timeInfo = new QLabel( info->exifInfo.dateTime, GenGroup);
-	ExifValues exif = item->pixm.imgInfo.exifInfo;
-
-	// return PyUnicode_FromString(item->Pfile.toUtf8());
-	return PyUnicode_FromString("abcd");
 }
 
 PyObject *scribus_getimagefile(PyObject* /* self */, PyObject* args)
@@ -482,7 +460,6 @@
 	  << scribus_getfillshade__doc__ 
 	  << scribus_getfilltrans__doc__
 	  << scribus_getimagecolorspace__doc__
-	  << scribus_getimageexiffield__doc__
 	  << scribus_getimagefile__doc__
 	  << scribus_getimageoffset__doc__
 	  << scribus_getimagescale__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23387&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	Fri Nov 29 12:18:10 2019
@@ -177,16 +177,6 @@
 PyObject *scribus_getimagecolorspace(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getimageexiffield__doc__,
-QT_TR_NOOP("getImageExifField(fiel, [\"name\"]) -> string\n\
-\n\
-Returns the exif field for the image in the image frame. If \"name\" is not\n\
-given the currently selected item is used.\n\
-"));
-/*! Returns image name of the object */
-PyObject *scribus_getimageexiffield(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
 PyDoc_STRVAR(scribus_getimagefile__doc__,
 QT_TR_NOOP("getImageFile([\"name\"]) -> string\n\
 \n\

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23387&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	Fri Nov 29 12:18:10 2019
@@ -363,7 +363,6 @@
 	{const_cast<char*>("getHGuides"), (PyCFunction)scribus_getHguides, METH_NOARGS, tr(scribus_getHguides__doc__)},
 	{const_cast<char*>("getImageColorSpace"), scribus_getimagecolorspace, METH_VARARGS, tr(scribus_getimagecolorspace__doc__) },
 	{const_cast<char*>("getImageFile"), scribus_getimagefile, METH_VARARGS, tr(scribus_getimagefile__doc__)},
-	{const_cast<char*>("getImageExifField"), scribus_getimageexiffield, METH_VARARGS, tr(scribus_getimageexiffield__doc__)},
 	{const_cast<char*>("getImageOffset"), scribus_getimageoffset, METH_VARARGS, tr(scribus_getimageoffset__doc__)},
 	{const_cast<char*>("getImageScale"), scribus_getimagescale, METH_VARARGS, tr(scribus_getimagescale__doc__)},
 	{const_cast<char*>("getLayers"), (PyCFunction)scribus_getlayers, METH_NOARGS, tr(scribus_getlayers__doc__)},




More information about the scribus-commit mailing list