Mercurial > hg > octave-nkf

comparison scripts/image/private/ind2x.m @ 17176:abf384f5d243

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Remove unneeded input validation from internal fcns in private/ directories. * scripts/general/private/__isequal__.m, scripts/general/private/__splinen__.m, scripts/image/private/__imwrite__.m, scripts/image/private/ind2x.m, scripts/miscellaneous/private/__xzip__.m, scripts/miscellaneous/private/display_info_file.m, scripts/pkg/private/describe.m, scripts/pkg/private/get_forge_pkg.m, scripts/pkg/private/unload_packages.m, scripts/plot/private/__actual_axis_position__.m, scripts/plot/private/__add_datasource__.m, scripts/plot/private/__clabel__.m, scripts/plot/private/__errcomm__.m, scripts/plot/private/__errplot__.m, scripts/plot/private/__fltk_print__.m, scripts/plot/private/__gnuplot_get_var__.m, scripts/plot/private/__go_draw_axes__.m, scripts/plot/private/__go_draw_figure__.m, scripts/plot/private/__interp_cube__.m, scripts/plot/private/__line__.m, scripts/plot/private/__next_line_color__.m, scripts/plot/private/__next_line_style__.m, scripts/plot/private/__plt__.m, scripts/plot/private/__pltopt__.m, scripts/signal/private/rectangle_lw.m, scripts/signal/private/rectangle_sw.m, scripts/signal/private/triangle_lw.m, scripts/signal/private/triangle_sw.m, scripts/sparse/private/__sprand_impl__.m, scripts/statistics/models/private/logistic_regression_derivatives.m, scripts/statistics/models/private/logistic_regression_likelihood.m: Remove unneeded input validation from internal fcns in private/ directories.
author Rik <rik@octave.org>
date Sun, 04 Aug 2013 18:13:08 -0700
parents 4c11e9bcb796
children 1c89599167a6
comparison
equal deleted inserted replaced
17175:4bb7ae321901 17176:abf384f5d243
20 ## private function for the ind2XXX functions which have a lot of code in common 20 ## private function for the ind2XXX functions which have a lot of code in common
21 21
22 function [x, map] = ind2x (caller, x, map) 22 function [x, map] = ind2x (caller, x, map)
23 23
24 ## Check if X is an indexed image. 24 ## Check if X is an indexed image.
25 ## an indexed image is defined has having only 2D, and that's how matlab 25 ## an indexed image is defined has having only 2D, and that's how Matlab
26 ## behaves. But we want to support ND images, so we will allow up to 4D 26 ## behaves. But we want to support ND images, so we will allow up to 4D
27 ## and check that the 3rd is a singleton 27 ## and check that the 3rd is a singleton
28 if (all (ndims (x) != [2 4]) || size (x, 3) != 1 || issparse (x) || 28 if (all (ndims (x) != [2 4]) || size (x, 3) != 1 || issparse (x) ||
29 (isfloat (x) && ! isindex (x)) || 29 (isfloat (x) && ! isindex (x)) ||
30 ! any (strcmp (class (x), {"uint8", "uint16", "single", "double"}))) 30 ! any (strcmp (class (x), {"uint8", "uint16", "single", "double"})))
31 error ("%s: X must be an indexed image", caller); 31 error ("%s: X must be an indexed image", caller);
49 maxidx += 1; 49 maxidx += 1;
50 endif 50 endif
51 51
52 num_colors = rows (map); 52 num_colors = rows (map);
53 if (num_colors < maxidx) 53 if (num_colors < maxidx)
54 ## Pad with the last color in the map for matlab compatibility 54 ## Pad with the last color in the map for Matlab compatibility
55 pad = repmat (map(end,:), maxidx - num_colors, 1); 55 pad = repmat (map(end,:), maxidx - num_colors, 1);
56 map(end+1:maxidx, :) = pad; 56 map(end+1:maxidx, :) = pad;
57 endif 57 endif
58 58
59 endfunction 59 endfunction