diff --git a/src/base/photoflow_run_batch.cc b/src/base/photoflow_run_batch.cc index b18426127..c90a2ad6d 100644 --- a/src/base/photoflow_run_batch.cc +++ b/src/base/photoflow_run_batch.cc @@ -412,12 +412,12 @@ int PF::PhotoFlow::run_batch(int argc, char *argv[]) std::cout<<"bname="<& in, int first, if( vips_hist_local( ucharimg, &claheimg, width.get(), width.get(), "max_slope", slope.get(), NULL ) ) { - std::cout<<"WARNIG: CLAHEPar::build(): vips_hist_local() failed."<& in, int first, if( (ctop+ch) > srcimg->Ysize ) ch = srcimg->Ysize - ctop; if( vips_crop( srcimg, &out, cleft, ctop, cw, ch, NULL ) ) { - std::cout<<"WARNIG: CropPar::build(): vips_crop() failed."<Xsize="<Xsize<<" srcimg->Ysize="<Ysize<& in, int first, int ctop = (outnew->Ysize - ch)/2; VipsImage* timg = NULL; if( vips_crop( outnew, &timg, cleft, ctop, cw, ch, NULL ) ) { - std::cout<<"WARNIG: LensFunPar::build(): vips_crop() failed."<Xsize="<Xsize<<" outnew->Ysize="<Ysize<& in, int first, std::cout<<"rotation: out_width="<"<"<Xsize="<Xsize<<" srcimg->Ysize="<Ysize<& in, int first, int dw = rotated->Xsize - roi_out.width; int dh = rotated->Ysize - roi_out.height; if( vips_crop( rotated, &out, dw/2, dh/2, roi_out.width, roi_out.height, NULL ) ) { - std::cout<<"WARNIG: ScalePar::build(): vips_crop() failed."<Xsize="<Xsize<<" srcimg->Ysize="<Ysize<::%s: %s: Init invokation not done at the " + "CImg<%s>::%s: %s: Init invocation not done at the " "beginning of expression '%s%s%s'.", pixel_type(),_cimg_mp_calling_function,s_op, (ss - 4)>expr._data?"...":"", diff --git a/src/vips/gmic/gmic/src/gmic.cpp b/src/vips/gmic/gmic/src/gmic.cpp index 421ebfb16..58babd8a7 100644 --- a/src/vips/gmic/gmic/src/gmic.cpp +++ b/src/vips/gmic/gmic/src/gmic.cpp @@ -4718,7 +4718,7 @@ gmic& gmic::_run(const CImgList& commands_line, unsigned int& position, // Check if a new name has been requested for a command that does not allow that. if (new_name && !is_double_hyphen && !is_input_command) error(images,0,0, - "Item '%s %s': Unknow name '%s'.", + "Item '%s %s': Unknown name '%s'.", initial_item,initial_argument,new_name.data()); // Dispatch to dedicated parsing code, regarding the first character of the command. @@ -11792,7 +11792,7 @@ gmic& gmic::_run(const CImgList& commands_line, unsigned int& position, commands_names[i].assign(); commands_has_arguments[i].assign(); } - print(images,0,"Discard definitions of all custom commmands (%u command%s discarded).", + print(images,0,"Discard definitions of all custom commands (%u command%s discarded).", nb_commands,nb_commands>1?"s":""); } else { // Discard one or several custom command. g_list_c = CImg::string(argument).get_split(CImg::vector(','),0,false); diff --git a/src/vips/gmic/gmic/src/gmic_def.gmic b/src/vips/gmic/gmic/src/gmic_def.gmic index 68dc3745a..7d5d9f008 100644 --- a/src/vips/gmic/gmic/src/gmic_def.gmic +++ b/src/vips/gmic/gmic/src/gmic_def.gmic @@ -669,7 +669,7 @@ g=$_gmic_g c=$_gmic_c n=$_gmic_n r=$_gmic_r \n cropped region of image "${g}"[ind]"$n" (or from default image selected if '"${c}"ind"$n"' is not specified). \n Cropped region starts from point "${g}"(x,y,z,c)"$n" and has a size of "${g}"dx x dy x dz x dc"$n". Arguments for \n coordinates and sizes can be omitted if they are not ambiguous (e.g. '"${c}"crop(#ind,x,y,dx,dy)"$n"' is a -\n valid invokation of this function). +\n valid invocation of this function). \n . '"${c}"draw(_#ind,S,x,y,z,c,dx,_dy,_dz,_dc,_opacity,_M,_max_M)"$n"' draws a sprite "${g}"S"$n" in image "${g}"[ind]"$n" \n (or in default image selected if '"${c}"ind"$n"' is not specified) at specified coordinates "${g}"(x,y,z,c)"$n". \n The size of the sprite "${g}"dx x dy x dz x dc"$n" must be specified. You can also specify a corresponding