Merge pull request #866 from tSed/master

[openjpeg.git] / src / lib / openjp2 / image.h

diff --git a/src/lib/openjp2/image.h b/src/lib/openjp2/image.h
index 9a037f3aef935bc4055fee373e03a4b31cd728bb..bad83c61359b2f4cac5676bd435540637dec7e5e 100644 (file)
--- a/src/lib/openjp2/image.h
+++ b/src/lib/openjp2/image.h
@@ -1,4 +1,9 @@
 /*
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
@@ -23,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __IMAGE_H
-#define __IMAGE_H
+#ifndef OPJ_IMAGE_H
+#define OPJ_IMAGE_H
 /**
 @file image.h
 @brief Implementation of operations on images (IMAGE)
@@ -33,7 +38,7 @@ The functions in IMAGE.C have for goal to realize operations on images.
 */
 
 struct opj_image;
-struct opj_cp_v2;
+struct opj_cp;
 
 /** @defgroup IMAGE IMAGE - Implementation of operations on images */
 /*@{*/
@@ -50,14 +55,16 @@ opj_image_t* opj_image_create0(void);
 /**
  * Updates the components characteristics of the image from the coding parameters.
  *
- * @param p_image_header               the image header to update.
- * @param p_cp                                 the coding parameters from which to update the image.
+ * @param p_image_header        the image header to update.
+ * @param p_cp                  the coding parameters from which to update the image.
  */
-void opj_image_comp_header_update(opj_image_t * p_image, const struct opj_cp* p_cp);
+void opj_image_comp_header_update(opj_image_t * p_image,
+                                  const struct opj_cp* p_cp);
 
-void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest);
+void opj_copy_image_header(const opj_image_t* p_image_src,
+                           opj_image_t* p_image_dest);
 
 /*@}*/
 
-#endif /* __IMAGE_H */
+#endif /* OPJ_IMAGE_H */