Skip to content

Commit cefe300

Browse files
sloriotsloriot
authored
typo CGAL_NO_DEPREACTED_CODE (#9239)
The preprocessor directive is misspelled and will normally not be used, corrected. Note: I cannot compile CGAL so I don't know whether the code inside the `#if` construct is correct (i.e. when `CGAL_NO_DEPRECATED_CODE` is set and not set).
2 parents 326c2c3 + 15c3ea6 commit cefe300

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎Classification/examples/Classification/example_classification.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ int main (int argc, char** argv)
214214
CGAL::IO::write_PLY_with_properties
215215
(f, CGAL::make_range (boost::counting_iterator<std::size_t>(0),
216216
boost::counting_iterator<std::size_t>(pts.size())),
217-
CGAL::make_ply_point_writer (CGAL::make_property_map(pts)),
218-
std::make_pair(CGAL::make_property_map(red), CGAL::PLY_property<unsigned char>("red")),
219-
std::make_pair(CGAL::make_property_map(green), CGAL::PLY_property<unsigned char>("green")),
220-
std::make_pair(CGAL::make_property_map(blue), CGAL::PLY_property<unsigned char>("blue")));
217+
CGAL::IO::make_ply_point_writer (CGAL::make_property_map(pts)),
218+
std::make_pair(CGAL::make_property_map(red), CGAL::IO::PLY_property<unsigned char>("red")),
219+
std::make_pair(CGAL::make_property_map(green), CGAL::IO::PLY_property<unsigned char>("green")),
220+
std::make_pair(CGAL::make_property_map(blue), CGAL::IO::PLY_property<unsigned char>("blue")));
221221

222222

223223
std::cerr << "All done" << std::endl;

‎Point_set_processing_3/examples/Point_set_processing_3/read_ply_points_with_colors_example.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ int main(int argc, char*argv[])
2929
std::vector<PNCI> points; // store points
3030
std::ifstream in(fname);
3131
if(!CGAL::IO::read_PLY_with_properties(in, std::back_inserter(points),
32-
CGAL::make_ply_point_reader(Point_map()),
33-
std::make_pair(Intensity_map(), CGAL::PLY_property<int>("intensity")),
32+
CGAL::IO::make_ply_point_reader(Point_map()),
33+
std::make_pair(Intensity_map(), CGAL::IO::PLY_property<int>("intensity")),
3434
std::make_tuple(Color_map(),
3535
CGAL::Construct_array(),
3636
CGAL::IO::PLY_property<unsigned char>("red"),

‎Point_set_processing_3/examples/Point_set_processing_3/write_ply_points_example.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main(int, char**)
5757
CGAL::IO::set_binary_mode(f); // The PLY file will be written in the binary format
5858

5959
CGAL::IO::write_PLY_with_properties(f, points,
60-
CGAL::make_ply_point_writer (Point_map()),
60+
CGAL::IO::make_ply_point_writer (Point_map()),
6161
std::make_tuple(Color_map(),
6262
CGAL::IO::PLY_property<unsigned char>("red"),
6363
CGAL::IO::PLY_property<unsigned char>("green"),

‎Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/polyfit_example_model_complexity_control.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ int main(int argc, char* argv[])
5252

5353
if (!CGAL::IO::read_PLY_with_properties(input_stream,
5454
std::back_inserter(points),
55-
CGAL::make_ply_point_reader(Point_map()),
56-
CGAL::make_ply_normal_reader(Normal_map()),
57-
std::make_pair(Plane_index_map(), CGAL::PLY_property<int>("segment_index"))))
55+
CGAL::IO::make_ply_point_reader(Point_map()),
56+
CGAL::IO::make_ply_normal_reader(Normal_map()),
57+
std::make_pair(Plane_index_map(), CGAL::IO::PLY_property<int>("segment_index"))))
5858
{
5959
std::cerr << "Error: cannot read file " << input_file << std::endl;
6060
return EXIT_FAILURE;

‎Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/polyfit_example_user_provided_planes.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ int main(int argc, char* argv[])
5252

5353
if (!CGAL::IO::read_PLY_with_properties(input_stream,
5454
std::back_inserter(points),
55-
CGAL::make_ply_point_reader(Point_map()),
56-
CGAL::make_ply_normal_reader(Normal_map()),
57-
std::make_pair(Plane_index_map(), CGAL::PLY_property<int>("segment_index"))))
55+
CGAL::IO::make_ply_point_reader(Point_map()),
56+
CGAL::IO::make_ply_normal_reader(Normal_map()),
57+
std::make_pair(Plane_index_map(), CGAL::IO::PLY_property<int>("segment_index"))))
5858
{
5959
std::cerr << "Error: cannot read file " << input_file << std::endl;
6060
return EXIT_FAILURE;

‎Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/polygonal_surface_reconstruction_test_framework.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ int reconstruct(const std::string& input_file, bool force_extract_planes)
9898
if (!CGAL::IO::read_PLY_with_properties(
9999
input_stream,
100100
std::back_inserter(points),
101-
CGAL::make_ply_point_reader(Point_map()),
102-
CGAL::make_ply_normal_reader(Normal_map()),
103-
std::make_pair(Plane_index_map(), CGAL::PLY_property<int>("segment_index"))))
101+
CGAL::IO::make_ply_point_reader(Point_map()),
102+
CGAL::IO::make_ply_normal_reader(Normal_map()),
103+
std::make_pair(Plane_index_map(), CGAL::IO::PLY_property<int>("segment_index"))))
104104
{
105105
std::cerr << " Error: cannot read file " << input_file << std::endl;
106106
return EXIT_FAILURE;

‎Shape_detection/examples/Shape_detection/include/utils.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ void save_point_regions_2(
7777
CGAL::IO::set_ascii_mode(out);
7878
CGAL::IO::write_PLY_with_properties(
7979
out, pwc,
80-
CGAL::make_ply_point_writer(PLY_Point_map()),
80+
CGAL::IO::make_ply_point_writer(PLY_Point_map()),
8181
std::make_tuple(
8282
PLY_Color_map(),
83-
CGAL::PLY_property<unsigned char>("red"),
84-
CGAL::PLY_property<unsigned char>("green"),
85-
CGAL::PLY_property<unsigned char>("blue")));
83+
CGAL::IO::PLY_property<unsigned char>("red"),
84+
CGAL::IO::PLY_property<unsigned char>("green"),
85+
CGAL::IO::PLY_property<unsigned char>("blue")));
8686
out.close();
8787
}
8888

@@ -122,12 +122,12 @@ void save_point_regions_3(
122122
CGAL::IO::set_ascii_mode(out);
123123
CGAL::IO::write_PLY_with_properties(
124124
out, pwc,
125-
CGAL::make_ply_point_writer(PLY_Point_map()),
125+
CGAL::IO::make_ply_point_writer(PLY_Point_map()),
126126
std::make_tuple(
127127
PLY_Color_map(),
128-
CGAL::PLY_property<unsigned char>("red"),
129-
CGAL::PLY_property<unsigned char>("green"),
130-
CGAL::PLY_property<unsigned char>("blue")));
128+
CGAL::IO::PLY_property<unsigned char>("red"),
129+
CGAL::IO::PLY_property<unsigned char>("green"),
130+
CGAL::IO::PLY_property<unsigned char>("blue")));
131131
out.close();
132132
}
133133

@@ -170,12 +170,12 @@ void save_segment_regions_2(
170170
CGAL::IO::set_ascii_mode(out);
171171
CGAL::IO::write_PLY_with_properties(
172172
out, pwc,
173-
CGAL::make_ply_point_writer(PLY_Point_map()),
173+
CGAL::IO::make_ply_point_writer(PLY_Point_map()),
174174
std::make_tuple(
175175
PLY_Color_map(),
176-
CGAL::PLY_property<unsigned char>("red"),
177-
CGAL::PLY_property<unsigned char>("green"),
178-
CGAL::PLY_property<unsigned char>("blue")));
176+
CGAL::IO::PLY_property<unsigned char>("red"),
177+
CGAL::IO::PLY_property<unsigned char>("green"),
178+
CGAL::IO::PLY_property<unsigned char>("blue")));
179179
out.close();
180180
}
181181

@@ -216,12 +216,12 @@ void save_segment_regions_3(
216216
CGAL::IO::set_ascii_mode(out);
217217
CGAL::IO::write_PLY_with_properties(
218218
out, pwc,
219-
CGAL::make_ply_point_writer(PLY_Point_map()),
219+
CGAL::IO::make_ply_point_writer(PLY_Point_map()),
220220
std::make_tuple(
221221
PLY_Color_map(),
222-
CGAL::PLY_property<unsigned char>("red"),
223-
CGAL::PLY_property<unsigned char>("green"),
224-
CGAL::PLY_property<unsigned char>("blue")));
222+
CGAL::IO::PLY_property<unsigned char>("red"),
223+
CGAL::IO::PLY_property<unsigned char>("green"),
224+
CGAL::IO::PLY_property<unsigned char>("blue")));
225225
out.close();
226226
}
227227

‎Stream_support/include/CGAL/IO/PLY/PLY_reader.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ bool read_PLY_faces(std::istream& in,
783783
} // namespace PLY
784784
} // namespace internal
785785

786-
#ifndef CGAL_NO_DEPREACTED_CODE
786+
#ifndef CGAL_NO_DEPRECATED_CODE
787787
using IO::PLY_property;
788788
using IO::make_ply_normal_reader;
789789
using IO::make_ply_normal_writer;

‎Stream_support/test/Stream_support/issue8155.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ int main()
3535
pv_pairs.clear();
3636
std::ifstream file("data/simple_ascii.ply");
3737
CGAL::IO::read_PLY_with_properties<PointVectorPair>(file, boost::function_output_iterator(lambda),
38-
CGAL::make_ply_point_reader(Point_map()),
39-
CGAL::make_ply_normal_reader(Normal_map()));
38+
CGAL::IO::make_ply_point_reader(Point_map()),
39+
CGAL::IO::make_ply_normal_reader(Normal_map()));
4040

4141
assert(pv_pairs[0].first == Point_3(1, 1, 1));
4242
assert(pv_pairs[1].first == Point_3(3, 3, 3));

0 commit comments

Comments
 (0)