NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

All I did in this commit was remove any of the ::kernel_1a, ::expand_1a,

Browse Source 
qualifiers from any uses of dlib::array.
This commit is contained in:
Davis King 2012-03-10 14:51:55 -05:00
parent 138848f92e
commit ad1c665ab4
17 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlib/bayes_utils/bayes_utils.h
View File

@ -1272,7 +1272,7 @@ namespace dlib
private: private:
graph< joint_probability_table, joint_probability_table >::kernel_1a_c join_tree_values; graph< joint_probability_table, joint_probability_table >::kernel_1a_c join_tree_values;
array<unsigned long>::expand_1a_c cliques; array<unsigned long> cliques;
mutable joint_probability_table table; mutable joint_probability_table table;
mutable assignment var; mutable assignment var;
mutable matrix<double,1> dist; mutable matrix<double,1> dist;
@ -1496,8 +1496,8 @@ namespace dlib
// the tree is now initialized. Now all we need to do is perform the propagation and // the tree is now initialized. Now all we need to do is perform the propagation and
// we are done // we are done
dlib::array<dlib::set<unsigned long>::compare_1b_c>::expand_1a_c remaining_msg_to_send; dlib::array<dlib::set<unsigned long>::compare_1b_c> remaining_msg_to_send;
dlib::array<dlib::set<unsigned long>::compare_1b_c>::expand_1a_c remaining_msg_to_receive; dlib::array<dlib::set<unsigned long>::compare_1b_c> remaining_msg_to_receive;
remaining_msg_to_receive.resize(join_tree.number_of_nodes()); remaining_msg_to_receive.resize(join_tree.number_of_nodes());
remaining_msg_to_send.resize(join_tree.number_of_nodes()); remaining_msg_to_send.resize(join_tree.number_of_nodes());
for (unsigned long i = 0; i < remaining_msg_to_receive.size(); ++i) for (unsigned long i = 0; i < remaining_msg_to_receive.size(); ++i)

16
dlib/gui_widgets/base_widgets.h
View File

@ -2135,16 +2135,16 @@ namespace dlib
rectangle win_rect; rectangle win_rect;
unsigned long left_width; unsigned long left_width;
unsigned long middle_width; unsigned long middle_width;
array<scoped_ptr<menu_item> >::expand_1d_c items; array<scoped_ptr<menu_item> > items;
array<bool>::expand_1d_c item_enabled; array<bool> item_enabled;
array<rectangle>::expand_1d_c left_rects; array<rectangle> left_rects;
array<rectangle>::expand_1d_c middle_rects; array<rectangle> middle_rects;
array<rectangle>::expand_1d_c right_rects; array<rectangle> right_rects;
array<rectangle>::expand_1d_c line_rects; array<rectangle> line_rects;
array<popup_menu*>::expand_1d_c submenus; array<popup_menu*> submenus;
unsigned long selected_item; unsigned long selected_item;
bool submenu_open; bool submenu_open;
array<member_function_pointer<>::kernel_1a>::expand_1d_c hide_handlers; array<member_function_pointer<>::kernel_1a> hide_handlers;
// restricted functions // restricted functions
popup_menu(popup_menu&); // copy constructor popup_menu(popup_menu&); // copy constructor

2
dlib/gui_widgets/fonts.h
View File

@ -600,7 +600,7 @@ namespace dlib
bool bitmap_to_letter( array2d<char>& bitmap, unichar enc, unsigned long width, int x_offset, int y_offset ); bool bitmap_to_letter( array2d<char>& bitmap, unichar enc, unsigned long width, int x_offset, int y_offset );
array<letter>::expand_1b_c gl; array<letter> gl;
unichar default_char; // if (is_intialized == true), then this MUST be an actual glyph unichar default_char; // if (is_intialized == true), then this MUST be an actual glyph
bool is_initialized; bool is_initialized;
rectangle fbb; rectangle fbb;

10
dlib/gui_widgets/widgets.h
View File

@ -1306,7 +1306,7 @@ namespace dlib
unsigned long selected_tab_; unsigned long selected_tab_;
array<tab_data>::kernel_2a_c tabs; array<tab_data> tabs;
const long left_pad; const long left_pad;
const long right_pad; const long right_pad;
@ -1817,7 +1817,7 @@ namespace dlib
}; };
bool ms_enabled; bool ms_enabled;
typename array<data<S> >::kernel_2a_c items; array<data<S> > items;
any_function<void(unsigned long)> event_handler; any_function<void(unsigned long)> event_handler;
any_function<void(unsigned long)> single_click_event_handler; any_function<void(unsigned long)> single_click_event_handler;
unsigned long last_selected; unsigned long last_selected;
@ -2150,7 +2150,7 @@ namespace dlib
point underline_p2; point underline_p2;
}; };
array<menu_data>::kernel_2a_c menus; array<menu_data> menus;
unsigned long open_menu; unsigned long open_menu;
// restricted functions // restricted functions
@ -3178,8 +3178,8 @@ namespace dlib
); );
array2d<data_type> grid; array2d<data_type> grid;
array<unsigned long>::kernel_2a_c col_width; array<unsigned long> col_width;
array<unsigned long>::kernel_2a_c row_height; array<unsigned long> row_height;
bool has_focus; bool has_focus;
long active_col; long active_col;
long active_row; long active_row;

2
dlib/image_keypoint/hessian_pyramid.h
View File

@ -310,7 +310,7 @@ namespace dlib
long initial_step_size; long initial_step_size;
typedef array2d<double> image_type; typedef array2d<double> image_type;
typedef array<image_type>::expand_1d pyramid_type; typedef array<image_type> pyramid_type;
pyramid_type pyramid; pyramid_type pyramid;
}; };

2
dlib/image_keypoint/poly_image.h
View File

@ -627,7 +627,7 @@ namespace dlib
std::vector<std::vector<separable_filter_type> > filters; std::vector<std::vector<separable_filter_type> > filters;
dlib::array<array2d<float> >::expand_1b poly_coef; dlib::array<array2d<float> > poly_coef;
long order; long order;
long window_size; long window_size;
long border_size; long border_size;

4
dlib/image_processing/scan_image_pyramid.h
View File

@ -187,7 +187,7 @@ namespace dlib
} }
feature_extractor_type feats_config; // just here to hold configuration. use it to populate the feats elements. feature_extractor_type feats_config; // just here to hold configuration. use it to populate the feats elements.
typename array<feature_extractor_type>::kernel_2a feats; array<feature_extractor_type> feats;
std::vector<detection_template> det_templates; std::vector<detection_template> det_templates;
unsigned long max_dets_per_template; unsigned long max_dets_per_template;
unsigned long max_pyramid_levels; unsigned long max_pyramid_levels;
@ -534,7 +534,7 @@ namespace dlib
dets.clear(); dets.clear();
array<array2d<double> >::kernel_2a saliency_images; array<array2d<double> > saliency_images;
saliency_images.set_max_size(get_num_components_per_detection_template()); saliency_images.set_max_size(get_num_components_per_detection_template());
saliency_images.set_size(get_num_components_per_detection_template()); saliency_images.set_size(get_num_components_per_detection_template());
std::vector<std::pair<unsigned int,rectangle> > region_rects(get_num_components_per_detection_template()); std::vector<std::pair<unsigned int,rectangle> > region_rects(get_num_components_per_detection_template());

4
dlib/matrix/symmetric_matrix_cache.h
View File

@ -222,8 +222,8 @@ namespace dlib
!*/ !*/
mutable typename array<matrix<type,0,1,typename M::mem_manager_type> >::expand_1a cache; mutable array<matrix<type,0,1,typename M::mem_manager_type> > cache;
mutable typename array<long>::expand_1a references; mutable array<long> references;
matrix<type,0,1,typename M::mem_manager_type> diag_cache; matrix<type,0,1,typename M::mem_manager_type> diag_cache;
mutable std::vector<long> lookup; mutable std::vector<long> lookup;
mutable std::vector<long> rlookup; mutable std::vector<long> rlookup;

4
dlib/svm/kkmeans.h
View File

@ -270,12 +270,12 @@ namespace dlib
} }
typename array<scoped_ptr<kcentroid<kernel_type> > >::expand_1b_c centers; array<scoped_ptr<kcentroid<kernel_type> > > centers;
kcentroid<kernel_type> kc; kcentroid<kernel_type> kc;
scalar_type min_change; scalar_type min_change;
// temp variables // temp variables
array<unsigned long>::expand_1b_c assignments; array<unsigned long> assignments;
}; };
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------

2
dlib/svm/structural_svm_object_detection_problem.h
View File

@ -408,7 +408,7 @@ namespace dlib
overlap_tester_type boxes_overlap; overlap_tester_type boxes_overlap;
mutable typename array<image_scanner_type>::kernel_2a scanners; mutable array<image_scanner_type> scanners;
const image_array_type& images; const image_array_type& images;
const std::vector<std::vector<rectangle> >& truth_rects; const std::vector<std::vector<rectangle> >& truth_rects;

2
dlib/test/matrix2.cpp
View File

@ -166,7 +166,7 @@ namespace
std::vector<double> stdv(4); std::vector<double> stdv(4);
std_vector_c<double> stdv_c(4); std_vector_c<double> stdv_c(4);
dlib::array<double>::expand_1a_c arr; dlib::array<double> arr;
arr.resize(4); arr.resize(4);
for (long i = 0; i < 4; ++i) for (long i = 0; i < 4; ++i)
stdv[i] = stdv_c[i] = arr[i] = i+1; stdv[i] = stdv_c[i] = arr[i] = i+1;

14
dlib/test/object_detector.cpp
View File

@ -256,7 +256,7 @@ namespace
print_spinner(); print_spinner();
dlog << LINFO << "test_1()"; dlog << LINFO << "test_1()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
grayscale_image_array_type images; grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);
@ -298,7 +298,7 @@ namespace
print_spinner(); print_spinner();
dlog << LINFO << "test_1_fine_hog()"; dlog << LINFO << "test_1_fine_hog()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
grayscale_image_array_type images; grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);
@ -340,7 +340,7 @@ namespace
print_spinner(); print_spinner();
dlog << LINFO << "test_1_poly()"; dlog << LINFO << "test_1_poly()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
grayscale_image_array_type images; grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);
@ -382,7 +382,7 @@ namespace
print_spinner(); print_spinner();
dlog << LINFO << "test_1_poly_nn()"; dlog << LINFO << "test_1_poly_nn()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
grayscale_image_array_type images; grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);
@ -428,7 +428,7 @@ namespace
print_spinner(); print_spinner();
dlog << LINFO << "test_2()"; dlog << LINFO << "test_2()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
grayscale_image_array_type images; grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);
@ -513,8 +513,8 @@ namespace
dlog << LINFO << "test_3()"; dlog << LINFO << "test_3()";
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; typedef array<array2d<unsigned char> > grayscale_image_array_type;
typedef array<funny_image>::expand_1b funny_image_array_type; typedef array<funny_image> funny_image_array_type;
grayscale_image_array_type images_temp; grayscale_image_array_type images_temp;
funny_image_array_type images; funny_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;

8
dlib/test/scan_image.cpp
View File

@ -68,7 +68,7 @@ namespace
{ {
typedef typename image_array_type::type::type pixel_type; typedef typename image_array_type::type::type pixel_type;
typedef typename promote<pixel_type>::type ptype; typedef typename promote<pixel_type>::type ptype;
typename array<integral_image_generic<ptype> >::kernel_2a iimg; array<integral_image_generic<ptype> > iimg;
iimg.set_max_size(images.size()); iimg.set_max_size(images.size());
iimg.set_size(images.size()); iimg.set_size(images.size());
@ -222,7 +222,7 @@ namespace
fill_rect(img, rect, 255); fill_rect(img, rect, 255);
array<array2d<unsigned char> >::expand_1b images; array<array2d<unsigned char> > images;
std::vector<std::pair<unsigned int, rectangle> > rects; std::vector<std::pair<unsigned int, rectangle> > rects;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
@ -276,7 +276,7 @@ namespace
fill_rect(img, rect, 255); fill_rect(img, rect, 255);
array<array2d<unsigned char> >::expand_1b images; array<array2d<unsigned char> > images;
std::vector<std::pair<unsigned int, rectangle> > rects; std::vector<std::pair<unsigned int, rectangle> > rects;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
@ -326,7 +326,7 @@ namespace
rnd.set_seed("235"); rnd.set_seed("235");
typename array<array2d<pixel_type> >::expand_1b images; array<array2d<pixel_type> > images;
images.resize(1); images.resize(1);
images[0].set_size(200,180); images[0].set_size(200,180);

2
dlib/test/sockets2.cpp
View File

@ -128,7 +128,7 @@ namespace
start(); start();
array<scoped_ptr<connection> >::expand_1a_c cons; array<scoped_ptr<connection> > cons;
std::vector<long> bytes_received(6,0); std::vector<long> bytes_received(6,0);
scoped_ptr<connection> con_temp; scoped_ptr<connection> con_temp;

4
dlib/threads/thread_pool_extension.h
View File

@ -454,8 +454,8 @@ namespace dlib
}; };
array<task_state_type>::expand_1d tasks; array<task_state_type> tasks;
array<thread_id_type>::expand_1d worker_thread_ids; array<thread_id_type> worker_thread_ids;
mutex m; mutex m;
signaler task_done_signaler; signaler task_done_signaler;

3
examples/object_detector_advanced_ex.cpp
View File

@ -191,8 +191,7 @@ int main()
try try
{ {
// Get some data // Get some data
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; array<array2d<unsigned char> > images;
grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);

3
examples/object_detector_ex.cpp
View File

@ -101,8 +101,7 @@ int main()
try try
{ {
// The first thing we do is create the set of 3 images discussed above. // The first thing we do is create the set of 3 images discussed above.
typedef array<array2d<unsigned char> >::expand_1b grayscale_image_array_type; array<array2d<unsigned char> > images;
grayscale_image_array_type images;
std::vector<std::vector<rectangle> > object_locations; std::vector<std::vector<rectangle> > object_locations;
make_simple_test_data(images, object_locations); make_simple_test_data(images, object_locations);