Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some typos #222

Open
wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

fix some typos #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/base/photoflow_run_batch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@ int PF::PhotoFlow::run_batch(int argc, char *argv[])
std::cout<<"bname="<<bname<<std::endl;
std::string ext;
if( !PF::getFileExtension( "", bname, ext ) ) {
std::cout<<"PhotoFlow::run_batch(): Cannot detemine input file extension. Exiting."<<std::endl;
std::cout<<"PhotoFlow::run_batch(): Cannot determine input file extension. Exiting."<<std::endl;
return 1;
}
std::string iname;
if( !PF::getFileName( "", bname, iname ) ) {
std::cout<<"PhotoFlow::run_batch(): Cannot detemine input file name. Exiting."<<std::endl;
std::cout<<"PhotoFlow::run_batch(): Cannot determine input file name. Exiting."<<std::endl;
return 1;
}
std::cout<<"iname="<<iname<<std::endl;
Expand Down Expand Up @@ -455,7 +455,7 @@ int PF::PhotoFlow::run_batch(int argc, char *argv[])

std::string oext;
if( !PF::getFileExtension( "", img_out, oext ) ) {
std::cout<<"Cannot detemine output file extension. Exiting."<<std::endl;
std::cout<<"Cannot determine output file extension. Exiting."<<std::endl;
return 1;
}
if( oext == "pfi") {
Expand Down
2 changes: 1 addition & 1 deletion src/external/rawspeed/src/librawspeed/tiff/TiffIFD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ inline Endianness getTiffByteOrder(const ByteStream& bs, uint32 pos,
if (bs.hasPatternAt("MM", 2, pos))
return Endianness::big;

ThrowTPE("Failed to parse TIFF endianess information in %s.", context);
ThrowTPE("Failed to parse TIFF endianness information in %s.", context);
}

} // namespace rawspeed
2 changes: 1 addition & 1 deletion src/operations/clahe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ VipsImage* PF::CLAHEPar::build(std::vector<VipsImage*>& 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."<<std::endl;
std::cout<<"WARNING: CLAHEPar::build(): vips_hist_local() failed."<<std::endl;
return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion src/operations/crop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ VipsImage* PF::CropPar::build(std::vector<VipsImage*>& 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."<<std::endl;
std::cout<<"WARNING: CropPar::build(): vips_crop() failed."<<std::endl;
std::cout<<"srcimg->Xsize="<<srcimg->Xsize<<" srcimg->Ysize="<<srcimg->Ysize<<std::endl;
std::cout<<"vips_crop( srcimg, &out, "<<crop_left.get()/scale_factor<<", "<<crop_top.get()/scale_factor<<", "
<<crop_width.get()/scale_factor<<", "<<crop_height.get()/scale_factor<<", NULL )"<<std::endl;
Expand Down
2 changes: 1 addition & 1 deletion src/operations/lensfun.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ VipsImage* PF::LensFunParStep::build(std::vector<VipsImage*>& 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."<<std::endl;
std::cout<<"WARNING: LensFunPar::build(): vips_crop() failed."<<std::endl;
std::cout<<"outnew->Xsize="<<outnew->Xsize<<" outnew->Ysize="<<outnew->Ysize<<std::endl;
std::cout<<"vips_crop( outnew, &timg, "<<cleft<<", "<<ctop<<", "
<<cw<<", "<<ch<<", NULL )"<<std::endl;
Expand Down
4 changes: 2 additions & 2 deletions src/operations/scale.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ VipsImage* PF::ScalePar::build(std::vector<VipsImage*>& in, int first,
std::cout<<"rotation: out_width="<<out_width<<" dw1="<<dw1<<" dw2="<<dw2<<" dw="<<dw<<std::endl;
//std::cout<<"rotation: width="<<srcimg->Xsize<<"->"<<cropped_width<<" height="<<srcimg->Ysize<<"->"<<cropped_height<<std::endl;
if( vips_crop( srcimg, &out, dw, dh, out_width-2*dw, out_height-2*dh, NULL ) ) {
std::cout<<"WARNIG: ScalePar::build(): vips_crop() failed."<<std::endl;
std::cout<<"WARNING: ScalePar::build(): vips_crop() failed."<<std::endl;
//std::cout<<"srcimg->Xsize="<<srcimg->Xsize<<" srcimg->Ysize="<<srcimg->Ysize<<std::endl;
//std::cout<<"vips_crop( srcimg, &out, "<<crop_left.get()/scale_factor<<", "<<crop_top.get()/scale_factor<<", "
// <<crop_width.get()/scale_factor<<", "<<crop_height.get()/scale_factor<<", NULL )"<<std::endl;
Expand All @@ -337,7 +337,7 @@ VipsImage* PF::ScalePar::build(std::vector<VipsImage*>& 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."<<std::endl;
std::cout<<"WARNING: ScalePar::build(): vips_crop() failed."<<std::endl;
//std::cout<<"srcimg->Xsize="<<srcimg->Xsize<<" srcimg->Ysize="<<srcimg->Ysize<<std::endl;
//std::cout<<"vips_crop( srcimg, &out, "<<crop_left.get()/scale_factor<<", "<<crop_top.get()/scale_factor<<", "
// <<crop_width.get()/scale_factor<<", "<<crop_height.get()/scale_factor<<", NULL )"<<std::endl;
Expand Down
6 changes: 3 additions & 3 deletions src/pfbatch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ int main (int argc, char *argv[])
std::cout<<"bname="<<bname<<std::endl;
std::string ext;
if( !PF::getFileExtension( "", bname, ext ) ) {
std::cout<<"Cannot detemine input file extension. Exiting."<<std::endl;
std::cout<<"Cannot determine input file extension. Exiting."<<std::endl;
return 1;
}
std::string iname;
if( !PF::getFileName( "", bname, iname ) ) {
std::cout<<"Cannot detemine input file name. Exiting."<<std::endl;
std::cout<<"Cannot determine input file name. Exiting."<<std::endl;
return 1;
}
std::cout<<"iname="<<iname<<std::endl;
Expand All @@ -228,7 +228,7 @@ int main (int argc, char *argv[])

std::string oext;
if( !PF::getFileExtension( "", img_out, oext ) ) {
std::cout<<"Cannot detemine input file extension. Exiting."<<std::endl;
std::cout<<"Cannot determine input file extension. Exiting."<<std::endl;
return 1;
}
if( oext == "pfi") {
Expand Down
4 changes: 2 additions & 2 deletions src/vips/gmic/gmic/src/CImg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10549,7 +10549,7 @@ namespace cimg_library_suffixed {
if (siz!=curr_siz) {
if (_is_shared)
throw CImgArgumentException(_cimg_instance
"assign(): Invalid assignement request of shared instance from specified "
"assign(): Invalid assignment request of shared instance from specified "
"image (%u,%u,%u,%u).",
cimg_instance,
size_x,size_y,size_z,size_c);
Expand Down Expand Up @@ -17185,7 +17185,7 @@ namespace cimg_library_suffixed {
if (ss0!=expr._data || code.width()) { // (only allowed as the first instruction)
*se = saved_char; cimg::strellipsize(expr,64);
throw CImgArgumentException("[_cimg_math_parser] "
"CImg<%s>::%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?"...":"",
Expand Down
4 changes: 2 additions & 2 deletions src/vips/gmic/gmic/src/gmic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4718,7 +4718,7 @@ gmic& gmic::_run(const CImgList<char>& 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.
Expand Down Expand Up @@ -11792,7 +11792,7 @@ gmic& gmic::_run(const CImgList<char>& 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<char>::string(argument).get_split(CImg<char>::vector(','),0,false);
Expand Down
2 changes: 1 addition & 1 deletion src/vips/gmic/gmic/src/gmic_def.gmic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down