Revert accidental changes and fix indentation

Xarthisius · Xarthisius · commit d75b068212f6 · 2016-12-25T07:53:26.000-06:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -483,8 +483,7 @@ def __init__(self, filename, metadata=None):
             source_date = datetime.today()
 
         self.infoDict = {
-            'Creator': 'matplotlib ' + __version__ +
-                       ', http://matplotlib.org',
+            'Creator': 'matplotlib %s, http://matplotlib.org' % __version__,
             'Producer': 'matplotlib pdf backend%s' % revision,
             'CreationDate': source_date
         }
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -285,27 +285,26 @@ static PyObject *Py_write_png(PyObject *self, PyObject *args, PyObject *kwds)
 
 #ifdef PNG_TEXT_SUPPORTED
     // Save the metadata
-    if (metadata != NULL)
-    {
-       meta_size = PyDict_Size(metadata);
-       text = new png_text[meta_size];
+    if (metadata != NULL) {
+        meta_size = PyDict_Size(metadata);
+        text = new png_text[meta_size];
 
-       while (PyDict_Next(metadata, &pos, &meta_key, &meta_val)) {
-          text[meta_pos].compression = PNG_TEXT_COMPRESSION_NONE;
+        while (PyDict_Next(metadata, &pos, &meta_key, &meta_val)) {
+            text[meta_pos].compression = PNG_TEXT_COMPRESSION_NONE;
 #if PY3K
-          text[meta_pos].key = PyBytes_AsString(meta_key);
-          text[meta_pos].text = PyBytes_AsString(meta_val);
+            text[meta_pos].key = PyBytes_AsString(meta_key);
+            text[meta_pos].text = PyBytes_AsString(meta_val);
 #else
-          text[meta_pos].key = PyString_AsString(meta_key);
-          text[meta_pos].text = PyString_AsString(meta_val);
+            text[meta_pos].key = PyString_AsString(meta_key);
+            text[meta_pos].text = PyString_AsString(meta_val);
 #endif
 #ifdef PNG_iTXt_SUPPORTED
-          text[meta_pos].lang = NULL;
+            text[meta_pos].lang = NULL;
 #endif
-          meta_pos++;
-       }
-       png_set_text(png_ptr, info_ptr, text, meta_size);
-       delete[] text;
+            meta_pos++;
+        }
+        png_set_text(png_ptr, info_ptr, text, meta_size);
+        delete[] text;
     }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -483,8 +483,7 @@ def __init__(self, filename, metadata=None):`
`483`	`483`	`source_date = datetime.today()`
`484`	`484`
`485`	`485`	`self.infoDict = {`
`486`		`- 'Creator': 'matplotlib ' + __version__ +`
`487`		`- ', http://matplotlib.org',`
	`486`	`+ 'Creator': 'matplotlib %s, http://matplotlib.org' % __version__,`
`488`	`487`	`'Producer': 'matplotlib pdf backend%s' % revision,`
`489`	`488`	`'CreationDate': source_date`
`490`	`489`	`}`