Various small fixes and spellcheck

Signed-off-by: Aleksandr Motsjonov <[email protected]>

Author: soswow

README.md

@@ -23,17 +23,18 @@ The output image complies with the ACES Container specification [(SMPTE S2065-4)
 
 The source code contains the following:
 
-* [`cmake/`](./cmake) - CMake modules for locating dependencies (e.g., `libraw `)
+* [`build_scripts/`](./build_scripts) - Helper scripts for installing dependencies
+* [`cmake/`](./cmake) - CMake modules for locating dependencies (e.g., `libraw`)
 * [`config/`](./config) - CMake configuration files
 * [`data/`](./data) - Data files containing camera sensitivity, light source, color matching function and 190 training patch data
-* [`lib/`](./lib) - IDT and math libraries
-* [`src/`](./src) - AcesRender wrapper library and C++ header file containing `rawtoaces` usage information
-* [`test/`](./test) - Sample testing materials such as a ".NEF" RAW image and a camera spectral sensitivity data file
-* [`main.cpp`](main.cpp) - C++ source code file for call routines to process images
+* [`include/`](./include) - Public header files for the `rawtoaces` library
+* [`src/`](./src) - Source code for `rawtoaces` utilities and IDT implementation
+* [`unittest/`](./unittest) - Unit tests for `rawtoaces`
+* [`main.cpp`](./src/rawtoaces/main.cpp) - C++ source file for call routines to process images
 
 ## Prerequisites
 
-To build `rawtoaces` you would need to sutisfy these dependencies:
+To build `rawtoaces` you would need to satisfy these dependencies:
 
 | Library          | Min Version| Purpose  | Link to installation instruction |
 | -------          | -----------| -------- | -------------------------------- |
@@ -112,7 +113,7 @@ $ cmake --build build
 $ sudo cmake --install build # Optional if you want it to be accessible system wide
 ```
 
-The default process will install `librawtoaces_idt_${rawtoaces_version}.dylib` and `librawtoaces_util_${rawtoaces_version}.dylib` to `/usr/local/lib`, a few header files to `/usr/local/include/rawtoaces/include` and a number of data files into `/usr/local/include/rawtoaces/data`.
+The default process will install `librawtoaces_idt_${rawtoaces_version}.dylib` and `librawtoaces_util_${rawtoaces_version}.dylib` to `/usr/local/lib`, a few header files to `/usr/local/include/rawtoaces` and a number of data files into `/usr/local/include/rawtoaces/data`.
 
 #### Docker
 

config/RAWTOACES.pc.in

@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@INSTALL_BIN_DIR@
 libdir=@INSTALL_LIB_DIR@
 includedir=@INSTALL_INCLUDE_DIR@
-RAWTOACES_includedir=@INSTALL_INCLUDE_DIR@/RAWTOACES
+RAWTOACES_includedir=@INSTALL_INCLUDE_DIR@/rawtoaces
 
 Name: RAWTOACES
 Description: RAWTOACES raw image to ACES

src/rawtoaces_idt/rta.cpp

@@ -86,7 +86,7 @@ void Illum::setIllumIndex( const double &index )
 //      const char *: type of light source if user specifies
 //
 //	outputs:
-//		int: If successufully parsed, private data members (e.g., _data)
+//		int: If successfully parsed, private data members (e.g., _data)
 //           will be filled and return 1; Otherwise, return 0
 
 int Illum::readSPD( const string &path, const string &type )
@@ -203,7 +203,7 @@ vector<double> Illum::cctToxy( const double &cctd ) const
 //      const int: cct / correlated color temperature
 //
 //	outputs:
-//		int: If successufully processed, private data members (e.g., _data)
+//		int: If successfully processed, private data members (e.g., _data)
 //           will be filled and return 1; Otherwise, return 0
 
 void Illum::calDayLightSPD( const int &cct )
@@ -341,7 +341,7 @@ const double Illum::getIllumIndex() const
 //      const int: temp / temperature
 //
 //	outputs:
-//		int: If successufully processed, private data members (e.g., _data)
+//		int: If successfully processed, private data members (e.g., _data)
 //           will be filled and return 1; Otherwise, return 0
 
 void Illum::calBlackBodySPD( const int &cct )
@@ -520,7 +520,7 @@ char *Spst::getModel()
 //      N/A
 //
 //	outputs:
-//	    uint8_t: Wavelength increment value (e.g., 5nm, 10nm) of the
+//	    int: Wavelength increment value (e.g., 5nm, 10nm) of the
 //               camera's sensitivity
 
 int Spst::getWLIncrement()
@@ -807,7 +807,7 @@ void Idt::scaleLSC( Illum &Illuminant )
 //      const char *: camera model  (from libraw)
 //
 //	outputs:
-//		boolean: If successufully parsed, _cameraSpst will be filled and return 1;
+//		boolean: If successfully parsed, _cameraSpst will be filled and return 1;
 //               Otherwise, return 0
 
 int Idt::loadCameraSpst(
@@ -825,7 +825,7 @@ int Idt::loadCameraSpst(
 //      string: type of light source if user specifies
 //
 //	outputs:
-//		int: If successufully parsed, _bestIllum will be filled and return 1;
+//		int: If successfully parsed, _bestIllum will be filled and return 1;
 //               Otherwise, return 0
 
 int Idt::loadIlluminant( const vector<string> &paths, string type )
@@ -914,7 +914,7 @@ int Idt::loadIlluminant( const vector<string> &paths, string type )
 //		string : path to the 190-patch training data
 //
 //	outputs:
-//		_trainingSpec: If successufully parsed, _trainingSpec will be filled
+//		_trainingSpec: If successfully parsed, _trainingSpec will be filled
 
 void Idt::loadTrainingData( const string &path )
 {
@@ -961,7 +961,7 @@ void Idt::loadTrainingData( const string &path )
 //		string : path to the CIE 1931 Color Matching Functions data
 //
 //	outputs:
-//		_cmf: If successufully parsed, _cmf will be filled
+//		_cmf: If successfully parsed, _cmf will be filled
 
 void Idt::loadCMF( const string &path )
 {

src/rawtoaces_util/acesrender.cpp

@@ -1969,8 +1969,10 @@ const vector<string> AcesRender::getSupportedCameras() const
 void AcesRender::printLibRawCameras()
 {
     const char **cl = _rawProcessor->cameraList();
-    while ( *( cl + 1 ) != NULL )
+    while ( *cl != nullptr )
+    {
         printf( "%s\n", *cl++ );
+    }
 }
 
 //	=====================================================================

unittest/testMisc.cpp

@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE( Test_LowerCase )
     char text_test[] = "rawtoaces";
 
     lowerCase( text );
-    FORI( strlen( text ) - 1 )
+    FORI( strlen( text ) )
     BOOST_CHECK_EQUAL( text[i], text_test[i] );
 };