Skip to content

Commit

Permalink
Merge pull request #4 from rolkar/feature/copyright
Browse files Browse the repository at this point in the history
Update Copyright
  • Loading branch information
erikrk committed Jun 30, 2015
2 parents 7b6cbcd + b10c3b9 commit d21b2a9
Show file tree
Hide file tree
Showing 37 changed files with 265 additions and 30 deletions.
5 changes: 4 additions & 1 deletion doc/copyright.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
BSD-style License
----------------------------------------------------------------

* Copyright (c) 2010, Roland Karlsson ([email protected])
* Copyright (c) 2015,
* Roland Karlsson ([email protected])
* Erik Karlsson ([email protected])
* Mark Roden ([email protected]) - [anisotropic filtering parts]
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_denoise.cpp
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_denoise.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_denoise_aniso.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_denoise_aniso.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 10 additions & 0 deletions src/x3f_denoise_utils.cpp
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
13 changes: 10 additions & 3 deletions src/x3f_denoise_utils.h
Original file line number Diff line number Diff line change
@@ -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++
Expand Down
7 changes: 6 additions & 1 deletion src/x3f_dngtags.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 6 additions & 1 deletion src/x3f_dngtags.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_dump.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_DUMP.C - Library for accessing X3F Files.
/* X3F_DUMP.C
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for writing unprocessed RAW and JPEG data.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_dump.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_DUMP.H - Library for accessing X3F Files.
/* X3F_DUMP.H
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for writing unprocessed RAW and JPEG data.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
7 changes: 5 additions & 2 deletions src/x3f_extract.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/* X3F_EXTRACT.C - Extracting images from X3F files
/* X3F_EXTRACT.C
*
* Copyright 2010-2015 (c) - Roland Karlsson ([email protected])
* Extracting images from X3F files.
* Also converting to histogram and color image.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_histogram.c
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_histogram.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions src/x3f_image.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_IMAGE.C - Library for accessing X3F Files.
/* X3F_IMAGE.C
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for access to image data.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_image.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_IMAGE.H - Library for accessing X3F Files.
/* X3F_IMAGE.H
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for access to image data.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_io.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_IO.C - Library for accessing X3F Files.
/* X3F_IO.C
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for accessing X3F Files.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_io.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_IO.H - Library for accessing X3F Files.
/* X3F_IO.H
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for accessing X3F Files.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_io_test.c
Original file line number Diff line number Diff line change
@@ -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 ([email protected])
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_matrix.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_matrix.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions src/x3f_meta.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_META.C - Library for accessing X3F Files.
/* X3F_META.C
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* 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
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_meta.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_META.H - Library for accessing X3F Files.
/* X3F_META.H
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* 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
*
*/
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_dng.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_dng.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_ppm.c
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_ppm.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_tiff.c
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
9 changes: 9 additions & 0 deletions src/x3f_output_tiff.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions src/x3f_print.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_PRINT.C - Library for accessing X3F Files.
/* X3F_PRINT.C
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for printing meta data found in X3F files.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
6 changes: 4 additions & 2 deletions src/x3f_print.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* X3F_PRINT.H - Library for accessing X3F Files.
/* X3F_PRINT.H
*
* Copyright (c) 2010 - Roland Karlsson ([email protected])
* Library for printing meta data found in X3F files.
*
* Copyright 2015 - Roland and Erik Karlsson
* BSD-style - see doc/copyright.txt
*
*/
Expand Down
Loading

0 comments on commit d21b2a9

Please sign in to comment.