diff --git a/.gitignore b/.gitignore index 7415765..512189a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ **/cmake_install.cmake **/*.bmp **/bin/** +**/bin/ diff --git a/ABitmapClass/bin/ABitmapClass b/ABitmapClass/bin/ABitmapClass index 4377e5a..6c1dd18 100755 Binary files a/ABitmapClass/bin/ABitmapClass and b/ABitmapClass/bin/ABitmapClass differ diff --git a/ABitmapClass/src/BitmapFileHeader.h b/ABitmapClass/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ABitmapClass/src/BitmapFileHeader.h +++ b/ABitmapClass/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ABitmapClass/src/BitmapInfoHeader.h b/ABitmapClass/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ABitmapClass/src/BitmapInfoHeader.h +++ b/ABitmapClass/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/AMandelbrotClass/bin/AMandelbrotClass b/AMandelbrotClass/bin/AMandelbrotClass index c20e3ce..10a1e12 100755 Binary files a/AMandelbrotClass/bin/AMandelbrotClass and b/AMandelbrotClass/bin/AMandelbrotClass differ diff --git a/AMandelbrotClass/src/BitmapFileHeader.h b/AMandelbrotClass/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/AMandelbrotClass/src/BitmapFileHeader.h +++ b/AMandelbrotClass/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/AMandelbrotClass/src/BitmapInfoHeader.h b/AMandelbrotClass/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/AMandelbrotClass/src/BitmapInfoHeader.h +++ b/AMandelbrotClass/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/AZoomClass/bin/AZoomClass b/AZoomClass/bin/AZoomClass index db6dd74..e0e8a53 100755 Binary files a/AZoomClass/bin/AZoomClass and b/AZoomClass/bin/AZoomClass differ diff --git a/AZoomClass/src/BitmapFileHeader.h b/AZoomClass/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/AZoomClass/src/BitmapFileHeader.h +++ b/AZoomClass/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/AZoomClass/src/BitmapInfoHeader.h b/AZoomClass/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/AZoomClass/src/BitmapInfoHeader.h +++ b/AZoomClass/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/AnRGBClass/bin/AnRGBClass b/AnRGBClass/bin/AnRGBClass index cc44065..2e35660 100755 Binary files a/AnRGBClass/bin/AnRGBClass and b/AnRGBClass/bin/AnRGBClass differ diff --git a/AnRGBClass/src/BitmapFileHeader.h b/AnRGBClass/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/AnRGBClass/src/BitmapFileHeader.h +++ b/AnRGBClass/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/AnRGBClass/src/BitmapInfoHeader.h b/AnRGBClass/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/AnRGBClass/src/BitmapInfoHeader.h +++ b/AnRGBClass/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ApplyingtheZoom/bin/ApplyingtheZoom b/ApplyingtheZoom/bin/ApplyingtheZoom index 88c5dc5..ea87498 100755 Binary files a/ApplyingtheZoom/bin/ApplyingtheZoom and b/ApplyingtheZoom/bin/ApplyingtheZoom differ diff --git a/ApplyingtheZoom/src/BitmapFileHeader.h b/ApplyingtheZoom/src/BitmapFileHeader.h index 7bc246b..d706a2f 100644 --- a/ApplyingtheZoom/src/BitmapFileHeader.h +++ b/ApplyingtheZoom/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(push, 1) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -24,6 +24,7 @@ struct BitmapFileHeader { }; #pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ApplyingtheZoom/src/BitmapInfoHeader.h b/ApplyingtheZoom/src/BitmapInfoHeader.h index 083c2ce..e084658 100644 --- a/ApplyingtheZoom/src/BitmapInfoHeader.h +++ b/ApplyingtheZoom/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(push, 1) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -22,8 +22,9 @@ struct BitmapInfoHeader { int32_t colors{0}; int32_t importantColors{0}; }; -} #pragma pack(pop) +} + #endif diff --git a/Bind/bin/Bind b/Bind/bin/Bind index dca01ff..bf0f07f 100755 Binary files a/Bind/bin/Bind and b/Bind/bin/Bind differ diff --git a/BitmapFileHeaders/bin/BitmapFileHeaders b/BitmapFileHeaders/bin/BitmapFileHeaders index 0a75646..aa4aad1 100755 Binary files a/BitmapFileHeaders/bin/BitmapFileHeaders and b/BitmapFileHeaders/bin/BitmapFileHeaders differ diff --git a/BitmapFileHeaders/src/BitmapFileHeader.h b/BitmapFileHeaders/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/BitmapFileHeaders/src/BitmapFileHeader.h +++ b/BitmapFileHeaders/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/BitmapHeaderValues/bin/BitmapHeaderValues b/BitmapHeaderValues/bin/BitmapHeaderValues index 3cf4d0f..c511f0f 100755 Binary files a/BitmapHeaderValues/bin/BitmapHeaderValues and b/BitmapHeaderValues/bin/BitmapHeaderValues differ diff --git a/BitmapHeaderValues/src/BitmapFileHeader.h b/BitmapHeaderValues/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/BitmapHeaderValues/src/BitmapFileHeader.h +++ b/BitmapHeaderValues/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/BitmapHeaderValues/src/BitmapInfoHeader.h b/BitmapHeaderValues/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/BitmapHeaderValues/src/BitmapInfoHeader.h +++ b/BitmapHeaderValues/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/BitmapInfoHeaders/bin/BitmapInfoHeaders b/BitmapInfoHeaders/bin/BitmapInfoHeaders index 0a75646..aa4aad1 100755 Binary files a/BitmapInfoHeaders/bin/BitmapInfoHeaders and b/BitmapInfoHeaders/bin/BitmapInfoHeaders differ diff --git a/BitmapInfoHeaders/src/BitmapInfoHeader.h b/BitmapInfoHeaders/src/BitmapInfoHeader.h index 28589d5..e084658 100644 --- a/BitmapInfoHeaders/src/BitmapInfoHeader.h +++ b/BitmapInfoHeaders/src/BitmapInfoHeader.h @@ -5,7 +5,9 @@ using namespace std; -#pragma pack(2) +namespace caveofprogramming { + +#pragma pack(push, 2) struct BitmapInfoHeader { int32_t headerSize{40}; @@ -21,4 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + +} + #endif diff --git a/BitmapMemory/bin/BitmapMemory b/BitmapMemory/bin/BitmapMemory index bf68cb3..e3008ec 100755 Binary files a/BitmapMemory/bin/BitmapMemory and b/BitmapMemory/bin/BitmapMemory differ diff --git a/BitmapMemory/src/BitmapFileHeader.h b/BitmapMemory/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/BitmapMemory/src/BitmapFileHeader.h +++ b/BitmapMemory/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/BitmapMemory/src/BitmapInfoHeader.h b/BitmapMemory/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/BitmapMemory/src/BitmapInfoHeader.h +++ b/BitmapMemory/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/CalculatingRangeTotals/bin/CalculatingRangeTotals b/CalculatingRangeTotals/bin/CalculatingRangeTotals index 765b716..2ccac3a 100755 Binary files a/CalculatingRangeTotals/bin/CalculatingRangeTotals and b/CalculatingRangeTotals/bin/CalculatingRangeTotals differ diff --git a/CalculatingRangeTotals/src/BitmapFileHeader.h b/CalculatingRangeTotals/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/CalculatingRangeTotals/src/BitmapFileHeader.h +++ b/CalculatingRangeTotals/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/CalculatingRangeTotals/src/BitmapInfoHeader.h b/CalculatingRangeTotals/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/CalculatingRangeTotals/src/BitmapInfoHeader.h +++ b/CalculatingRangeTotals/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/CenteringandScaling/bin/CenteringandScaling b/CenteringandScaling/bin/CenteringandScaling index 150c89f..f4c11d3 100755 Binary files a/CenteringandScaling/bin/CenteringandScaling and b/CenteringandScaling/bin/CenteringandScaling differ diff --git a/CenteringandScaling/src/BitmapFileHeader.h b/CenteringandScaling/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/CenteringandScaling/src/BitmapFileHeader.h +++ b/CenteringandScaling/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/CenteringandScaling/src/BitmapInfoHeader.h b/CenteringandScaling/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/CenteringandScaling/src/BitmapInfoHeader.h +++ b/CenteringandScaling/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/CheckingtheRangeTotals/bin/CheckingtheRangeTotals b/CheckingtheRangeTotals/bin/CheckingtheRangeTotals index 13c7a4c..8960658 100755 Binary files a/CheckingtheRangeTotals/bin/CheckingtheRangeTotals and b/CheckingtheRangeTotals/bin/CheckingtheRangeTotals differ diff --git a/CheckingtheRangeTotals/src/BitmapFileHeader.h b/CheckingtheRangeTotals/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/CheckingtheRangeTotals/src/BitmapFileHeader.h +++ b/CheckingtheRangeTotals/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/CheckingtheRangeTotals/src/BitmapInfoHeader.h b/CheckingtheRangeTotals/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/CheckingtheRangeTotals/src/BitmapInfoHeader.h +++ b/CheckingtheRangeTotals/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ColorTransforms/bin/ColorTransforms b/ColorTransforms/bin/ColorTransforms index efeac63..f5ba0c6 100755 Binary files a/ColorTransforms/bin/ColorTransforms and b/ColorTransforms/bin/ColorTransforms differ diff --git a/ColorTransforms/src/BitmapFileHeader.h b/ColorTransforms/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ColorTransforms/src/BitmapFileHeader.h +++ b/ColorTransforms/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ColorTransforms/src/BitmapInfoHeader.h b/ColorTransforms/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ColorTransforms/src/BitmapInfoHeader.h +++ b/ColorTransforms/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ColourHistograms/bin/ColourHistograms b/ColourHistograms/bin/ColourHistograms index d80d2ff..1ee935c 100755 Binary files a/ColourHistograms/bin/ColourHistograms and b/ColourHistograms/bin/ColourHistograms differ diff --git a/ColourHistograms/src/BitmapFileHeader.h b/ColourHistograms/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ColourHistograms/src/BitmapFileHeader.h +++ b/ColourHistograms/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ColourHistograms/src/BitmapInfoHeader.h b/ColourHistograms/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ColourHistograms/src/BitmapInfoHeader.h +++ b/ColourHistograms/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ConstructorsandMemory/bin/ConstructorsandMemory b/ConstructorsandMemory/bin/ConstructorsandMemory index 3ffb2a0..9976be5 100755 Binary files a/ConstructorsandMemory/bin/ConstructorsandMemory and b/ConstructorsandMemory/bin/ConstructorsandMemory differ diff --git a/DecltypeAndTypeid/bin/DecltypeAndTypeid b/DecltypeAndTypeid/bin/DecltypeAndTypeid index 34055f8..5e70f67 100755 Binary files a/DecltypeAndTypeid/bin/DecltypeAndTypeid and b/DecltypeAndTypeid/bin/DecltypeAndTypeid differ diff --git a/DelegatingConctructors/bin/DelegatingConctructors b/DelegatingConctructors/bin/DelegatingConctructors index 60bb75c..1a265b0 100755 Binary files a/DelegatingConctructors/bin/DelegatingConctructors and b/DelegatingConctructors/bin/DelegatingConctructors differ diff --git a/DynamicCasts/bin/DynamicCasts b/DynamicCasts/bin/DynamicCasts index de7d0ff..aef00e3 100755 Binary files a/DynamicCasts/bin/DynamicCasts and b/DynamicCasts/bin/DynamicCasts differ diff --git a/EliminatingMaxIterations/bin/EliminatingMaxIterations b/EliminatingMaxIterations/bin/EliminatingMaxIterations index 5c60606..054f025 100755 Binary files a/EliminatingMaxIterations/bin/EliminatingMaxIterations and b/EliminatingMaxIterations/bin/EliminatingMaxIterations differ diff --git a/EliminatingMaxIterations/src/BitmapFileHeader.h b/EliminatingMaxIterations/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/EliminatingMaxIterations/src/BitmapFileHeader.h +++ b/EliminatingMaxIterations/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/EliminatingMaxIterations/src/BitmapInfoHeader.h b/EliminatingMaxIterations/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/EliminatingMaxIterations/src/BitmapInfoHeader.h +++ b/EliminatingMaxIterations/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ElisionandOptimization/bin/ElisionandOptimization b/ElisionandOptimization/bin/ElisionandOptimization index 73b1cca..5be4596 100755 Binary files a/ElisionandOptimization/bin/ElisionandOptimization and b/ElisionandOptimization/bin/ElisionandOptimization differ diff --git a/EnhancedForLoop/bin/EnhancedForLoop b/EnhancedForLoop/bin/EnhancedForLoop index 14d0e06..6c75e00 100755 Binary files a/EnhancedForLoop/bin/EnhancedForLoop and b/EnhancedForLoop/bin/EnhancedForLoop differ diff --git a/FractalCreatorHelloWorld/bin/FractalCreatorHelloWorld b/FractalCreatorHelloWorld/bin/FractalCreatorHelloWorld index 0a75646..aa4aad1 100755 Binary files a/FractalCreatorHelloWorld/bin/FractalCreatorHelloWorld and b/FractalCreatorHelloWorld/bin/FractalCreatorHelloWorld differ diff --git a/FunctionalTypes/bin/FunctionalTypes b/FunctionalTypes/bin/FunctionalTypes index 4ad95bf..d0c3a23 100755 Binary files a/FunctionalTypes/bin/FunctionalTypes and b/FunctionalTypes/bin/FunctionalTypes differ diff --git a/GettingPixelRanges/bin/GettingPixelRanges b/GettingPixelRanges/bin/GettingPixelRanges index 46b316f..7f576fd 100755 Binary files a/GettingPixelRanges/bin/GettingPixelRanges and b/GettingPixelRanges/bin/GettingPixelRanges differ diff --git a/GettingPixelRanges/src/BitmapFileHeader.h b/GettingPixelRanges/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/GettingPixelRanges/src/BitmapFileHeader.h +++ b/GettingPixelRanges/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/GettingPixelRanges/src/BitmapInfoHeader.h b/GettingPixelRanges/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/GettingPixelRanges/src/BitmapInfoHeader.h +++ b/GettingPixelRanges/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ImplementingFractalCreator/bin/ImplementingFractalCreator b/ImplementingFractalCreator/bin/ImplementingFractalCreator index 8d0d5a1..25818e1 100755 Binary files a/ImplementingFractalCreator/bin/ImplementingFractalCreator and b/ImplementingFractalCreator/bin/ImplementingFractalCreator differ diff --git a/ImplementingFractalCreator/src/BitmapFileHeader.h b/ImplementingFractalCreator/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ImplementingFractalCreator/src/BitmapFileHeader.h +++ b/ImplementingFractalCreator/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ImplementingFractalCreator/src/BitmapInfoHeader.h b/ImplementingFractalCreator/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ImplementingFractalCreator/src/BitmapInfoHeader.h +++ b/ImplementingFractalCreator/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ImprovingtheBasicFractal/bin/ImprovingtheBasicFractal b/ImprovingtheBasicFractal/bin/ImprovingtheBasicFractal index 2fe9dbe..4a4aa2f 100755 Binary files a/ImprovingtheBasicFractal/bin/ImprovingtheBasicFractal and b/ImprovingtheBasicFractal/bin/ImprovingtheBasicFractal differ diff --git a/ImprovingtheBasicFractal/src/BitmapFileHeader.h b/ImprovingtheBasicFractal/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ImprovingtheBasicFractal/src/BitmapFileHeader.h +++ b/ImprovingtheBasicFractal/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ImprovingtheBasicFractal/src/BitmapInfoHeader.h b/ImprovingtheBasicFractal/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ImprovingtheBasicFractal/src/BitmapInfoHeader.h +++ b/ImprovingtheBasicFractal/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/InitializerLists/bin/InitializerLists b/InitializerLists/bin/InitializerLists index 20fcec4..88dc724 100755 Binary files a/InitializerLists/bin/InitializerLists and b/InitializerLists/bin/InitializerLists differ diff --git a/IterableClasses/bin/IterableClasses b/IterableClasses/bin/IterableClasses index e3c2689..e3fd5dd 100755 Binary files a/IterableClasses/bin/IterableClasses and b/IterableClasses/bin/IterableClasses differ diff --git a/LValueReferences/bin/LValueReferences b/LValueReferences/bin/LValueReferences index c922e3f..97f7d2b 100755 Binary files a/LValueReferences/bin/LValueReferences and b/LValueReferences/bin/LValueReferences differ diff --git a/LambdaCaptureExpressions/bin/LambdaCaptureExpressions b/LambdaCaptureExpressions/bin/LambdaCaptureExpressions index 23fc09a..6b30d58 100755 Binary files a/LambdaCaptureExpressions/bin/LambdaCaptureExpressions and b/LambdaCaptureExpressions/bin/LambdaCaptureExpressions differ diff --git a/LambdaExpressions/bin/LambdaExpressions b/LambdaExpressions/bin/LambdaExpressions index 6fb0121..ad8e061 100755 Binary files a/LambdaExpressions/bin/LambdaExpressions and b/LambdaExpressions/bin/LambdaExpressions differ diff --git a/LambdaParametersAndReturnTypes/bin/LambdaParametersAndReturnTypes b/LambdaParametersAndReturnTypes/bin/LambdaParametersAndReturnTypes index a51eb08..d2f8d3b 100755 Binary files a/LambdaParametersAndReturnTypes/bin/LambdaParametersAndReturnTypes and b/LambdaParametersAndReturnTypes/bin/LambdaParametersAndReturnTypes differ diff --git a/MoveAssignmentOperators/bin/MoveAssignmentOperators b/MoveAssignmentOperators/bin/MoveAssignmentOperators index 428e3ee..d70372c 100755 Binary files a/MoveAssignmentOperators/bin/MoveAssignmentOperators and b/MoveAssignmentOperators/bin/MoveAssignmentOperators differ diff --git a/MoveConstructors/bin/MoveConstructors b/MoveConstructors/bin/MoveConstructors index b1a5623..4572db8 100755 Binary files a/MoveConstructors/bin/MoveConstructors and b/MoveConstructors/bin/MoveConstructors differ diff --git a/MutableLambdas/bin/MutableLambdas b/MutableLambdas/bin/MutableLambdas index a28fc30..fe072de 100755 Binary files a/MutableLambdas/bin/MutableLambdas and b/MutableLambdas/bin/MutableLambdas differ diff --git a/NestedTemplateClasses/bin/NestedTemplateClasses b/NestedTemplateClasses/bin/NestedTemplateClasses index 3a01926..7b65c41 100755 Binary files a/NestedTemplateClasses/bin/NestedTemplateClasses and b/NestedTemplateClasses/bin/NestedTemplateClasses differ diff --git a/ObjectInitialization/bin/ObjectInitialization b/ObjectInitialization/bin/ObjectInitialization index 491d4bb..78b0f84 100755 Binary files a/ObjectInitialization/bin/ObjectInitialization and b/ObjectInitialization/bin/ObjectInitialization differ diff --git a/PerfectForwarding/bin/PerfectForwarding b/PerfectForwarding/bin/PerfectForwarding index 4565a13..a4763de 100755 Binary files a/PerfectForwarding/bin/PerfectForwarding and b/PerfectForwarding/bin/PerfectForwarding differ diff --git a/RangeBasedColoring/bin/RangeBasedColoring b/RangeBasedColoring/bin/RangeBasedColoring index 73392c4..1d8dc42 100755 Binary files a/RangeBasedColoring/bin/RangeBasedColoring and b/RangeBasedColoring/bin/RangeBasedColoring differ diff --git a/RangeBasedColoring/src/BitmapFileHeader.h b/RangeBasedColoring/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/RangeBasedColoring/src/BitmapFileHeader.h +++ b/RangeBasedColoring/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/RangeBasedColoring/src/BitmapInfoHeader.h b/RangeBasedColoring/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/RangeBasedColoring/src/BitmapInfoHeader.h +++ b/RangeBasedColoring/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ReinterpretCast/bin/ReinterpretCast b/ReinterpretCast/bin/ReinterpretCast index 688df14..aa3d57a 100755 Binary files a/ReinterpretCast/bin/ReinterpretCast and b/ReinterpretCast/bin/ReinterpretCast differ diff --git a/ReorganisingMain/bin/ReorganisingMain b/ReorganisingMain/bin/ReorganisingMain index 5eee646..3e278bd 100755 Binary files a/ReorganisingMain/bin/ReorganisingMain and b/ReorganisingMain/bin/ReorganisingMain differ diff --git a/ReorganisingMain/src/BitmapFileHeader.h b/ReorganisingMain/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ReorganisingMain/src/BitmapFileHeader.h +++ b/ReorganisingMain/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ReorganisingMain/src/BitmapInfoHeader.h b/ReorganisingMain/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ReorganisingMain/src/BitmapInfoHeader.h +++ b/ReorganisingMain/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/RingBuffer/bin/RingBuffer b/RingBuffer/bin/RingBuffer index 8d63d01..a58f3cf 100755 Binary files a/RingBuffer/bin/RingBuffer and b/RingBuffer/bin/RingBuffer differ diff --git a/RvalueReferences/bin/RvalueReferences b/RvalueReferences/bin/RvalueReferences index 962ce3b..09b1279 100755 Binary files a/RvalueReferences/bin/RvalueReferences and b/RvalueReferences/bin/RvalueReferences differ diff --git a/Scaling/bin/Scaling b/Scaling/bin/Scaling index 6bb0f31..2581732 100755 Binary files a/Scaling/bin/Scaling and b/Scaling/bin/Scaling differ diff --git a/Scaling/src/BitmapFileHeader.h b/Scaling/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/Scaling/src/BitmapFileHeader.h +++ b/Scaling/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/Scaling/src/BitmapInfoHeader.h b/Scaling/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/Scaling/src/BitmapInfoHeader.h +++ b/Scaling/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/SettingPixels/src/BitmapFileHeader.h b/SettingPixels/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/SettingPixels/src/BitmapFileHeader.h +++ b/SettingPixels/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/SettingPixels/src/BitmapInfoHeader.h b/SettingPixels/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/SettingPixels/src/BitmapInfoHeader.h +++ b/SettingPixels/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/SharedPointers/bin/SharedPointers b/SharedPointers/bin/SharedPointers index 6949184..ebc9653 100755 Binary files a/SharedPointers/bin/SharedPointers and b/SharedPointers/bin/SharedPointers differ diff --git a/SpecifyingColorRanges/bin/SpecifyingColorRanges b/SpecifyingColorRanges/bin/SpecifyingColorRanges index 611ab5b..08424b8 100755 Binary files a/SpecifyingColorRanges/bin/SpecifyingColorRanges and b/SpecifyingColorRanges/bin/SpecifyingColorRanges differ diff --git a/SpecifyingColorRanges/src/BitmapFileHeader.h b/SpecifyingColorRanges/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/SpecifyingColorRanges/src/BitmapFileHeader.h +++ b/SpecifyingColorRanges/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/SpecifyingColorRanges/src/BitmapInfoHeader.h b/SpecifyingColorRanges/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/SpecifyingColorRanges/src/BitmapInfoHeader.h +++ b/SpecifyingColorRanges/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/StaticCast/bin/StaticCast b/StaticCast/bin/StaticCast index d9d0a1f..ff2cc64 100755 Binary files a/StaticCast/bin/StaticCast and b/StaticCast/bin/StaticCast differ diff --git a/StoringIterations/bin/StoringIterations b/StoringIterations/bin/StoringIterations index 27d92ce..aec10d1 100755 Binary files a/StoringIterations/bin/StoringIterations and b/StoringIterations/bin/StoringIterations differ diff --git a/StoringIterations/src/BitmapFileHeader.h b/StoringIterations/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/StoringIterations/src/BitmapFileHeader.h +++ b/StoringIterations/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/StoringIterations/src/BitmapInfoHeader.h b/StoringIterations/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/StoringIterations/src/BitmapInfoHeader.h +++ b/StoringIterations/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/TheAutoKeyword/bin/TheAutoKeyword b/TheAutoKeyword/bin/TheAutoKeyword index 2795c5c..2a16df0 100755 Binary files a/TheAutoKeyword/bin/TheAutoKeyword and b/TheAutoKeyword/bin/TheAutoKeyword differ diff --git a/TheFractalAlgorithm/src/BitmapFileHeader.h b/TheFractalAlgorithm/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/TheFractalAlgorithm/src/BitmapFileHeader.h +++ b/TheFractalAlgorithm/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/TheFractalAlgorithm/src/BitmapInfoHeader.h b/TheFractalAlgorithm/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/TheFractalAlgorithm/src/BitmapInfoHeader.h +++ b/TheFractalAlgorithm/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/TheZoomList/bin/TheZoomList b/TheZoomList/bin/TheZoomList index 36b6c9c..d60cf08 100755 Binary files a/TheZoomList/bin/TheZoomList and b/TheZoomList/bin/TheZoomList differ diff --git a/TheZoomList/src/BitmapFileHeader.h b/TheZoomList/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/TheZoomList/src/BitmapFileHeader.h +++ b/TheZoomList/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/TheZoomList/src/BitmapInfoHeader.h b/TheZoomList/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/TheZoomList/src/BitmapInfoHeader.h +++ b/TheZoomList/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/UsingtheHistogram/bin/UsingtheHistogram b/UsingtheHistogram/bin/UsingtheHistogram index e943433..a09daf3 100755 Binary files a/UsingtheHistogram/bin/UsingtheHistogram and b/UsingtheHistogram/bin/UsingtheHistogram differ diff --git a/UsingtheHistogram/src/BitmapFileHeader.h b/UsingtheHistogram/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/UsingtheHistogram/src/BitmapFileHeader.h +++ b/UsingtheHistogram/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/UsingtheHistogram/src/BitmapInfoHeader.h b/UsingtheHistogram/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/UsingtheHistogram/src/BitmapInfoHeader.h +++ b/UsingtheHistogram/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/UsingtheRGBClass/bin/UsingtheRGBClass b/UsingtheRGBClass/bin/UsingtheRGBClass index 6e26e53..c313241 100755 Binary files a/UsingtheRGBClass/bin/UsingtheRGBClass and b/UsingtheRGBClass/bin/UsingtheRGBClass differ diff --git a/UsingtheRGBClass/src/BitmapFileHeader.h b/UsingtheRGBClass/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/UsingtheRGBClass/src/BitmapFileHeader.h +++ b/UsingtheRGBClass/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/UsingtheRGBClass/src/BitmapInfoHeader.h b/UsingtheRGBClass/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/UsingtheRGBClass/src/BitmapInfoHeader.h +++ b/UsingtheRGBClass/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ValidatingtheHistogram/bin/ValidatingtheHistogram b/ValidatingtheHistogram/bin/ValidatingtheHistogram index 9c66549..35446c4 100755 Binary files a/ValidatingtheHistogram/bin/ValidatingtheHistogram and b/ValidatingtheHistogram/bin/ValidatingtheHistogram differ diff --git a/ValidatingtheHistogram/src/BitmapFileHeader.h b/ValidatingtheHistogram/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ValidatingtheHistogram/src/BitmapFileHeader.h +++ b/ValidatingtheHistogram/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ValidatingtheHistogram/src/BitmapInfoHeader.h b/ValidatingtheHistogram/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ValidatingtheHistogram/src/BitmapInfoHeader.h +++ b/ValidatingtheHistogram/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/WritingABitmap/bin/WritingABitmap b/WritingABitmap/bin/WritingABitmap index 3f1e88d..6788b70 100755 Binary files a/WritingABitmap/bin/WritingABitmap and b/WritingABitmap/bin/WritingABitmap differ diff --git a/WritingABitmap/src/BitmapFileHeader.h b/WritingABitmap/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/WritingABitmap/src/BitmapFileHeader.h +++ b/WritingABitmap/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/WritingABitmap/src/BitmapInfoHeader.h b/WritingABitmap/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/WritingABitmap/src/BitmapInfoHeader.h +++ b/WritingABitmap/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/ZoomingIn/bin/ZoomingIn b/ZoomingIn/bin/ZoomingIn index 03a2b84..8ceaa5e 100755 Binary files a/ZoomingIn/bin/ZoomingIn and b/ZoomingIn/bin/ZoomingIn differ diff --git a/ZoomingIn/src/BitmapFileHeader.h b/ZoomingIn/src/BitmapFileHeader.h index 77ce1e2..d706a2f 100644 --- a/ZoomingIn/src/BitmapFileHeader.h +++ b/ZoomingIn/src/BitmapFileHeader.h @@ -12,10 +12,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapFileHeader { char header[2] { 'B', 'M' }; int32_t fileSize; @@ -23,6 +23,8 @@ struct BitmapFileHeader { int32_t dataOffset; }; +#pragma pack(pop) + } #endif /* BITMAPFILEHEADER_H_ */ diff --git a/ZoomingIn/src/BitmapInfoHeader.h b/ZoomingIn/src/BitmapInfoHeader.h index 4b614f1..e084658 100644 --- a/ZoomingIn/src/BitmapInfoHeader.h +++ b/ZoomingIn/src/BitmapInfoHeader.h @@ -5,10 +5,10 @@ using namespace std; -#pragma pack(2) - namespace caveofprogramming { +#pragma pack(push, 2) + struct BitmapInfoHeader { int32_t headerSize{40}; int32_t width; @@ -23,6 +23,8 @@ struct BitmapInfoHeader { int32_t importantColors{0}; }; +#pragma pack(pop) + } #endif diff --git a/lValuesandrValues/bin/lValuesandrValues b/lValuesandrValues/bin/lValuesandrValues index e9c8af8..8ac5ac1 100755 Binary files a/lValuesandrValues/bin/lValuesandrValues and b/lValuesandrValues/bin/lValuesandrValues differ