Merge pull request #4 from rolkar/feature/copyright

erikrk · erikrk · commit d21b2a97b00b · 2015-06-30T18:03:21.000+02:00
Update Copyright
diff --git a/doc/copyright.txt b/doc/copyright.txt
@@ -2,7 +2,10 @@
 BSD-style License
 ----------------------------------------------------------------
 
-* Copyright (c) 2010, Roland Karlsson (roland@proxel.se)
+* Copyright (c) 2015,
+*   Roland Karlsson (roland@proxel.se)
+*   Erik Karlsson (erik.r.karlsson@gmail.com)
+*   Mark Roden (mmroden@gmail.com) - [anisotropic filtering parts]
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/src/x3f_denoise.cpp b/src/x3f_denoise.cpp
@@ -1,3 +1,12 @@
+/* X3F_DENOISE.CPP
+ *
+ * Library for denoising of X3F image data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include <iostream>
 #include <inttypes.h>
 
diff --git a/src/x3f_denoise.h b/src/x3f_denoise.h
@@ -1,3 +1,12 @@
+/* X3F_DENOISE.H
+ *
+ * Library for denoising of X3F image data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_DENOISE_H
 #define X3F_DENOISE_H
 
diff --git a/src/x3f_denoise_aniso.cpp b/src/x3f_denoise_aniso.cpp
@@ -1,3 +1,12 @@
+/* X3F_DENOISE_ANISO.CPP
+ *
+ * Library for anisotropic denoising of X3F image data.
+ *
+ * Copyright 2015 - Mark Roden
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include <iostream>
 #include "x3f_denoise_aniso.h"
 #include "x3f_printf.h"
diff --git a/src/x3f_denoise_aniso.h b/src/x3f_denoise_aniso.h
@@ -1,3 +1,12 @@
+/* X3F_DENOISE_ANISO.H
+ *
+ * Library for anisotropic denoising of X3F image data.
+ *
+ * Copyright 2015 - Mark Roden
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef DENOISE_ANISO
 #define DENOISE_ANISO
 
diff --git a/src/x3f_denoise_utils.cpp b/src/x3f_denoise_utils.cpp
@@ -1,3 +1,13 @@
+/* X3F_DENOISE_UTILS.CPP
+ *
+ * Library for support functions for noise reduction algorithms,
+ * including color conversions and conversions to/from float type images
+ *
+ * Copyright 2015 - Mark Roden and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include <iostream>
 #include <inttypes.h>
 
diff --git a/src/x3f_denoise_utils.h b/src/x3f_denoise_utils.h
@@ -1,8 +1,15 @@
+/* X3F_DENOISE_UTILS.H
+ *
+ * Library for support functions for noise reduction algorithms,
+ * including color conversions and conversions to/from float type images
+ *
+ * Copyright 2015 - Mark Roden and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef DENOISE_UTILS
 #define DENOISE_UTILS
-/* this file contains the support functions for noise reduction algorithms,
-   including color conversions and conversions to/from float type images
- */
 
 #ifndef __cplusplus
 #error This file can only be included from C++
diff --git a/src/x3f_dngtags.c b/src/x3f_dngtags.c
@@ -1,8 +1,13 @@
-/* x3f_dngtags.c - libtiff tag extender for DNG tags.
+/* X3F_DNGTAGS.C
+ *
+ * libtiff tag extender for DNG tags.
  *
  * The current version of libtiff (4.0.3) only supports tags for DNG
  * versions <= 1.1.0.0
  *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
  */
 
 #include "x3f_dngtags.h"
diff --git a/src/x3f_dngtags.h b/src/x3f_dngtags.h
@@ -1,8 +1,13 @@
-/* x3f_dngtags.h - libtiff tag extender for DNG tags.
+/* X3F_DNGTAGS.H
+ *
+ * libtiff tag extender for DNG tags.
  *
  * The current version of libtiff (4.0.3) only supports tags for DNG
  * versions <= 1.1.0.0
  *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
  */
 
 #ifndef X3F_DNGTAGS_H
diff --git a/src/x3f_dump.c b/src/x3f_dump.c
@@ -1,6 +1,8 @@
-/* X3F_DUMP.C - Library for accessing X3F Files.
+/* X3F_DUMP.C
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for writing unprocessed RAW and JPEG data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_dump.h b/src/x3f_dump.h
@@ -1,6 +1,8 @@
-/* X3F_DUMP.H - Library for accessing X3F Files.
+/* X3F_DUMP.H
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for writing unprocessed RAW and JPEG data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_extract.c b/src/x3f_extract.c
@@ -1,6 +1,9 @@
-/* X3F_EXTRACT.C - Extracting images from X3F files
+/* X3F_EXTRACT.C
  *
- * Copyright 2010-2015 (c) - Roland Karlsson (roland@proxel.se)
+ * Extracting images from X3F files.
+ * Also converting to histogram and color image.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_histogram.c b/src/x3f_histogram.c
@@ -1,3 +1,12 @@
+/* X3F_HISTOGRAM.C
+ *
+ * Library for writing histogram data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include "x3f_histogram.h"
 #include "x3f_process.h"
 
diff --git a/src/x3f_histogram.h b/src/x3f_histogram.h
@@ -1,3 +1,12 @@
+/* X3F_HISTOGRAM.H
+ *
+ * Library for writing histogram data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_HISTOGRAM_H
 #define X3F_HISTOGRAM_H
 
diff --git a/src/x3f_image.c b/src/x3f_image.c
@@ -1,6 +1,8 @@
-/* X3F_IMAGE.C - Library for accessing X3F Files.
+/* X3F_IMAGE.C
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for access to image data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_image.h b/src/x3f_image.h
@@ -1,6 +1,8 @@
-/* X3F_IMAGE.H - Library for accessing X3F Files.
+/* X3F_IMAGE.H
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for access to image data.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_io.c b/src/x3f_io.c
@@ -1,6 +1,8 @@
-/* X3F_IO.C - Library for accessing X3F Files.
+/* X3F_IO.C
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for accessing X3F Files.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_io.h b/src/x3f_io.h
@@ -1,6 +1,8 @@
-/* X3F_IO.H - Library for accessing X3F Files.
+/* X3F_IO.H
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for accessing X3F Files.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_io_test.c b/src/x3f_io_test.c
@@ -1,6 +1,8 @@
-/* X3F_IO_TEST.C - Test of library for accessing X3F Files.
+/* X3F_IO_TEST.C
+ *
+ * Test of library for accessing X3F Files.
  * 
- * Copyright 2010 (c) - Roland Karlsson (roland@proxel.se)
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  * 
  */
diff --git a/src/x3f_matrix.c b/src/x3f_matrix.c
@@ -1,3 +1,12 @@
+/* X3F_MATRIX.C
+ *
+ * Library for manipulating matrices.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include <math.h>
 
 #include "x3f_matrix.h"
diff --git a/src/x3f_matrix.h b/src/x3f_matrix.h
@@ -1,3 +1,12 @@
+/* X3F_MATRIX.H
+ *
+ * Library for manipulating matrices.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_MATRIX_H
 #define X3F_MATRIX_H
 
diff --git a/src/x3f_meta.c b/src/x3f_meta.c
@@ -1,6 +1,8 @@
-/* X3F_META.C - Library for accessing X3F Files.
+/* X3F_META.C
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for accessing the CAMF and PROP meta data in the X3F file.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_meta.h b/src/x3f_meta.h
@@ -1,6 +1,8 @@
-/* X3F_META.H - Library for accessing X3F Files.
+/* X3F_META.H
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for accessing the CAMF and PROP meta data in the X3F file.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_output_dng.c b/src/x3f_output_dng.c
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_DNG.C
+ *
+ * Library for writing the image as DNG.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include "x3f_output_dng.h"
 #include "x3f_process.h"
 #include "x3f_dngtags.h"
diff --git a/src/x3f_output_dng.h b/src/x3f_output_dng.h
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_DNG.H
+ *
+ * Library for writing the image as DNG.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_OUTPUT_DNG_H
 #define X3F_OUTPUT_DNG_H
 
diff --git a/src/x3f_output_ppm.c b/src/x3f_output_ppm.c
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_PPM.C
+ *
+ * Library for writing the image as PPM.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include "x3f_output_ppm.h"
 #include "x3f_process.h"
 
diff --git a/src/x3f_output_ppm.h b/src/x3f_output_ppm.h
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_PPM.H
+ *
+ * Library for writing the image as PPM.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_OUTPUT_PPM_H
 #define X3F_OUTPUT_PPM_H
 
diff --git a/src/x3f_output_tiff.c b/src/x3f_output_tiff.c
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_TIFF.C
+ *
+ * Library for writing the image as TIFF.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #include "x3f_output_tiff.h"
 #include "x3f_process.h"
 
diff --git a/src/x3f_output_tiff.h b/src/x3f_output_tiff.h
@@ -1,3 +1,12 @@
+/* X3F_OUTPUT_TIFF.H
+ *
+ * Library for writing the image as TIFF.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
+ * BSD-style - see doc/copyright.txt
+ *
+ */
+
 #ifndef X3F_OUTPUT_TIFF_H
 #define X3F_OUTPUT_TIFF_H
 
diff --git a/src/x3f_print.c b/src/x3f_print.c
@@ -1,6 +1,8 @@
-/* X3F_PRINT.C - Library for accessing X3F Files.
+/* X3F_PRINT.C
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for printing meta data found in X3F files.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_print.h b/src/x3f_print.h
@@ -1,6 +1,8 @@
-/* X3F_PRINT.H - Library for accessing X3F Files.
+/* X3F_PRINT.H
  *
- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)
+ * Library for printing meta data found in X3F files.
+ *
+ * Copyright 2015 - Roland and Erik Karlsson
  * BSD-style - see doc/copyright.txt
  *
  */
diff --git a/src/x3f_printf.c b/src/x3f_printf.c
diff --git a/src/x3f_printf.h b/src/x3f_printf.h
diff --git a/src/x3f_process.c b/src/x3f_process.c
diff --git a/src/x3f_process.h b/src/x3f_process.h
diff --git a/src/x3f_spatial_gain.c b/src/x3f_spatial_gain.c
diff --git a/src/x3f_spatial_gain.h b/src/x3f_spatial_gain.h

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,13 @@`
`1`		`-/* x3f_dngtags.c - libtiff tag extender for DNG tags.`
	`1`	`+/* X3F_DNGTAGS.C`
	`2`	`+ *`
	`3`	`+ * libtiff tag extender for DNG tags.`
`2`	`4`	`*`
`3`	`5`	`* The current version of libtiff (4.0.3) only supports tags for DNG`
`4`	`6`	`* versions <= 1.1.0.0`
`5`	`7`	`*`
	`8`	`+ * Copyright 2015 - Roland and Erik Karlsson`
	`9`	`+ * BSD-style - see doc/copyright.txt`
	`10`	`+ *`
`6`	`11`	`*/`
`7`	`12`
`8`	`13`	`#include "x3f_dngtags.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,13 @@`
`1`		`-/* x3f_dngtags.h - libtiff tag extender for DNG tags.`
	`1`	`+/* X3F_DNGTAGS.H`
	`2`	`+ *`
	`3`	`+ * libtiff tag extender for DNG tags.`
`2`	`4`	`*`
`3`	`5`	`* The current version of libtiff (4.0.3) only supports tags for DNG`
`4`	`6`	`* versions <= 1.1.0.0`
`5`	`7`	`*`
	`8`	`+ * Copyright 2015 - Roland and Erik Karlsson`
	`9`	`+ * BSD-style - see doc/copyright.txt`
	`10`	`+ *`
`6`	`11`	`*/`
`7`	`12`
`8`	`13`	`#ifndef X3F_DNGTAGS_H`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`		`-/* X3F_DUMP.C - Library for accessing X3F Files.`
	`1`	`+/* X3F_DUMP.C`
`2`	`2`	`*`
`3`		`- * Copyright (c) 2010 - Roland Karlsson (roland@proxel.se)`
	`3`	`+ * Library for writing unprocessed RAW and JPEG data.`
	`4`	`+ *`
	`5`	`+ * Copyright 2015 - Roland and Erik Karlsson`
`4`	`6`	`* BSD-style - see doc/copyright.txt`
`5`	`7`	`*`
`6`	`8`	`*/`