[gimp] plug-ins: cleanup, copyright headers, formatting in the openexr-wrapper

[Michael Natterer <mitch src gnome org>]

commit b07975aa880e774f7c979169170fc54d66c45f5f
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jun 26 16:56:12 2019 +0200

    plug-ins: cleanup, copyright headers, formatting in the openexr-wrapper

 plug-ins/file-exr/exr-attribute-blob.h | 35 +++++++------
 plug-ins/file-exr/openexr-wrapper.cc   | 32 ++++++++++--
 plug-ins/file-exr/openexr-wrapper.h    | 95 +++++++++++++++-------------------
 3 files changed, 90 insertions(+), 72 deletions(-)
---
diff --git a/plug-ins/file-exr/exr-attribute-blob.h b/plug-ins/file-exr/exr-attribute-blob.h
index 1f31b201e7..449f252d4d 100644
--- a/plug-ins/file-exr/exr-attribute-blob.h
+++ b/plug-ins/file-exr/exr-attribute-blob.h
@@ -1,20 +1,23 @@
-/*
-    This file is part of GIMP,
-    copyright (c) 2012 johannes hanika
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * exr-attribute-blob.h
+ * copyright (c) 2012 johannes hanika
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
-    GIMP is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GIMP 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GIMP.  If not, see <https://www.gnu.org/licenses/>.
-*/
 #pragma once
 
 #include <ciso646>
diff --git a/plug-ins/file-exr/openexr-wrapper.cc b/plug-ins/file-exr/openexr-wrapper.cc
index ff3e14d0c0..c6786468f2 100644
--- a/plug-ins/file-exr/openexr-wrapper.cc
+++ b/plug-ins/file-exr/openexr-wrapper.cc
@@ -1,5 +1,26 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #include "config.h"
 
+#include <string>
+
+#include <lcms2.h>
+
 /*  These libgimp includes are not needed here at all, but this is a
  *  convenient place to make sure the public libgimp headers are
  *  C++-clean. The C++ compiler will choke on stuff like naming
@@ -7,9 +28,13 @@
  */
 #include "libgimp/gimp.h"
 #include "libgimp/gimpui.h"
+#include "libgimpbase/gimpbase.h"
+#include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
-
-#include "openexr-wrapper.h"
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpmodule/gimpmodule.h"
+#include "libgimpthumb/gimpthumb.h"
+#include "libgimpwidgets/gimpwidgets.h"
 
 #if defined(__MINGW32__)
 #ifndef FLT_EPSILON
@@ -29,9 +54,8 @@
 #include <ImfRgbaYca.h>
 #include <ImfStandardAttributes.h>
 
-#include <string>
-
 #include "exr-attribute-blob.h"
+#include "openexr-wrapper.h"
 
 using namespace Imf;
 using namespace Imf::RgbaYca;
diff --git a/plug-ins/file-exr/openexr-wrapper.h b/plug-ins/file-exr/openexr-wrapper.h
index f2cf3211bc..13f252ddff 100644
--- a/plug-ins/file-exr/openexr-wrapper.h
+++ b/plug-ins/file-exr/openexr-wrapper.h
@@ -1,77 +1,68 @@
-#ifndef OPENEXR_WRAPPER_H
-#define OPENEXR_WRAPPER_H
-
-/* Use C linkage so that the plug-in code written in C can use the
- * wrapper.
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-#include <lcms2.h>
+#ifndef __OPENEXR_WRAPPER_H__
+#define __OPENEXR_WRAPPER_H__
+
+G_BEGIN_DECLS
 
 /* This is fully opaque on purpose, as the calling C code must not be
  * exposed to more than this.
  */
 typedef struct _EXRLoader EXRLoader;
 
-typedef enum {
+typedef enum
+{
   PREC_UINT,
   PREC_HALF,
   PREC_FLOAT
 } EXRPrecision;
 
-typedef enum {
+typedef enum
+{
   IMAGE_TYPE_RGB,
   IMAGE_TYPE_GRAY
 } EXRImageType;
 
-EXRLoader *
-exr_loader_new (const char *filename);
-
-EXRLoader *
-exr_loader_ref (EXRLoader *loader);
-
-void
-exr_loader_unref (EXRLoader *loader);
-
-int
-exr_loader_get_width (EXRLoader *loader);
-
-int
-exr_loader_get_height (EXRLoader *loader);
-
-EXRPrecision
-exr_loader_get_precision (EXRLoader *loader);
-
-EXRImageType
-exr_loader_get_image_type (EXRLoader *loader);
 
-int
-exr_loader_has_alpha (EXRLoader *loader);
+EXRLoader        * exr_loader_new            (const char *filename);
 
-GimpColorProfile *
-exr_loader_get_profile (EXRLoader *loader);
+EXRLoader        * exr_loader_ref            (EXRLoader  *loader);
+void               exr_loader_unref          (EXRLoader  *loader);
 
-gchar *
-exr_loader_get_comment (EXRLoader *loader);
+int                exr_loader_get_width      (EXRLoader  *loader);
+int                exr_loader_get_height     (EXRLoader  *loader);
 
-guchar *
-exr_loader_get_exif (EXRLoader *loader,
-                     guint *size);
+EXRPrecision       exr_loader_get_precision  (EXRLoader  *loader);
+EXRImageType       exr_loader_get_image_type (EXRLoader  *loader);
+int                exr_loader_has_alpha      (EXRLoader  *loader);
 
-guchar *
-exr_loader_get_xmp (EXRLoader *loader,
-                    guint *size);
+GimpColorProfile * exr_loader_get_profile    (EXRLoader  *loader);
+gchar            * exr_loader_get_comment    (EXRLoader  *loader);
+guchar           * exr_loader_get_exif       (EXRLoader  *loader,
+                                              guint      *size);
+guchar           * exr_loader_get_xmp        (EXRLoader  *loader,
+                                              guint      *size);
 
-int
-exr_loader_read_pixel_row (EXRLoader *loader,
-                           char *pixels,
-                           int bpp,
-                           int row);
+int                exr_loader_read_pixel_row (EXRLoader *loader,
+                                              char      *pixels,
+                                              int        bpp,
+                                              int        row);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
-#endif /* OPENEXR_WRAPPER_H */
+#endif /* __OPENEXR_WRAPPER_H__ */