Skip to content

Commit 75c4334

Browse files
caveofprogrammingcaveofprogramming
committed
Fixed pragmas in headers so they work with Visual C++
1 parent c960cb8 commit 75c4334

File tree

118 files changed

+243
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+243
-120
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
**/cmake_install.cmake
55
**/*.bmp
66
**/bin/**
7+
**/bin/
78

‎ABitmapClass/bin/ABitmapClass

0 Bytes
Binary file not shown.

‎ABitmapClass/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎ABitmapClass/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎AMandelbrotClass/bin/AMandelbrotClass

0 Bytes
Binary file not shown.

‎AMandelbrotClass/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎AMandelbrotClass/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎AZoomClass/bin/AZoomClass

0 Bytes
Binary file not shown.

‎AZoomClass/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎AZoomClass/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎AnRGBClass/bin/AnRGBClass

0 Bytes
Binary file not shown.

‎AnRGBClass/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎AnRGBClass/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎ApplyingtheZoom/bin/ApplyingtheZoom

0 Bytes
Binary file not shown.

‎ApplyingtheZoom/src/BitmapFileHeader.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(push, 1)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
@@ -24,6 +24,7 @@ struct BitmapFileHeader {
2424
};
2525

2626
#pragma pack(pop)
27+
2728
}
2829

2930
#endif /* BITMAPFILEHEADER_H_ */

‎ApplyingtheZoom/src/BitmapInfoHeader.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(push, 1)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -22,8 +22,9 @@ struct BitmapInfoHeader {
2222
int32_t colors{0};
2323
int32_t importantColors{0};
2424
};
25-
}
2625

2726
#pragma pack(pop)
2827

28+
}
29+
2930
#endif

‎Bind/bin/Bind

0 Bytes
Binary file not shown.

‎BitmapFileHeaders/bin/BitmapFileHeaders

0 Bytes
Binary file not shown.

‎BitmapFileHeaders/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎BitmapHeaderValues/bin/BitmapHeaderValues

0 Bytes
Binary file not shown.

‎BitmapHeaderValues/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎BitmapHeaderValues/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎BitmapInfoHeaders/bin/BitmapInfoHeaders

0 Bytes
Binary file not shown.

‎BitmapInfoHeaders/src/BitmapInfoHeader.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
8+
namespace caveofprogramming {
9+
10+
#pragma pack(push, 2)
911

1012
struct BitmapInfoHeader {
1113
int32_t headerSize{40};
@@ -21,4 +23,8 @@ struct BitmapInfoHeader {
2123
int32_t importantColors{0};
2224
};
2325

26+
#pragma pack(pop)
27+
28+
}
29+
2430
#endif

‎BitmapMemory/bin/BitmapMemory

0 Bytes
Binary file not shown.

‎BitmapMemory/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

‎BitmapMemory/src/BitmapInfoHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace std;
77

8-
#pragma pack(2)
9-
108
namespace caveofprogramming {
119

10+
#pragma pack(push, 2)
11+
1212
struct BitmapInfoHeader {
1313
int32_t headerSize{40};
1414
int32_t width;
@@ -23,6 +23,8 @@ struct BitmapInfoHeader {
2323
int32_t importantColors{0};
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif

‎CalculatingRangeTotals/bin/CalculatingRangeTotals

0 Bytes
Binary file not shown.

‎CalculatingRangeTotals/src/BitmapFileHeader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212

1313
using namespace std;
1414

15-
#pragma pack(2)
16-
1715
namespace caveofprogramming {
1816

17+
#pragma pack(push, 2)
18+
1919
struct BitmapFileHeader {
2020
char header[2] { 'B', 'M' };
2121
int32_t fileSize;
2222
int32_t reserved { 0 };
2323
int32_t dataOffset;
2424
};
2525

26+
#pragma pack(pop)
27+
2628
}
2729

2830
#endif /* BITMAPFILEHEADER_H_ */

0 commit comments

Comments
 (0)