Correct some spelling mistakes

Automaticaly --> Automatically
Invalide --> Invalid
Strech --> Stretch
allows to --> allows one to
attachement --> attachment
contraints --> constraints
inconsistant --> inconsistent
occured --> occurred
occurences --> occurrences
permits to --> permits one to
postion --> position
regularily --> regularly
transfered --> transferred
This commit is contained in:
Nic Soudée
2019-01-24 08:32:58 -05:00
parent fc2839a3b6
commit 228e651b4f
13 changed files with 77 additions and 77 deletions

View File

@@ -159,7 +159,7 @@ int SFont_TextWidth(const SFont_Font *Font, const char *text)
int SFont_TextHeight(const SFont_Font* Font, const char *text)
{
// Count occurences of '\n'
// Count occurrences of '\n'
int nb_cr=0;
while (*text!='\0')
{

View File

@@ -2198,7 +2198,7 @@ void Button_Resolution(int btn)
Video_mode[selected_mode].Fullscreen,
chosen_pixel))
{
Error(0); // On signale à l'utilisateur que c'est un mode invalide
Error(0); // Tell user it is an invalid mode
Pixel_ratio=PIXEL_SIMPLE;
Init_mode_video(
Video_mode[Current_resolution].Width,

View File

@@ -1834,7 +1834,7 @@ void Load_IFF(T_IO_Context * context)
bpp = 12;
}
else
Warning("inconsistant size of BEAM/CTLB chunk, ignoring");
Warning("inconsistent size of BEAM/CTLB chunk, ignoring");
fseek(IFF_file, (section_size+1)&~1, SEEK_CUR);
}
else if (memcmp(section, "PCHG", 4) == 0) // Palette CHanGes
@@ -4752,7 +4752,7 @@ void Load_GIF(T_IO_Context * context)
special_case = GIF_get_next_code(GIF_file, &GIF);
if (GIF.current_code >= value_clr)
{
GFX2_Log(GFX2_INFO, "Load_GIF() Invalide code %u just after clear (=%u)!\n",
GFX2_Log(GFX2_INFO, "Load_GIF() Invalid code %u just after clear (=%u)!\n",
GIF.current_code, value_clr);
File_error = 2;
break;

View File

@@ -284,7 +284,7 @@ static const T_Help_table helptable_help[] =
HELP_LINK (" Back faster: %s", 0x200+BUTTON_PAL_LEFT)
HELP_LINK (" Forward faster: %s", 0x200+BUTTON_PAL_RIGHT)
HELP_TEXT ("")
HELP_TEXT ("Change brush attachement")
HELP_TEXT ("Change brush attachment")
HELP_LINK (" Center : %s", SPECIAL_CENTER_ATTACHMENT)
HELP_LINK (" Top-left : %s", SPECIAL_TOP_LEFT_ATTACHMENT)
HELP_LINK (" Top-right : %s", SPECIAL_TOP_RIGHT_ATTACHMENT)
@@ -830,9 +830,9 @@ static const T_Help_table helptable_draw[] =
HELP_TEXT ("hand-drawing modes:")
HELP_TEXT ("")
HELP_TEXT ("Continuous hand-drawing: as you move the")
HELP_TEXT ("mouse, the paintbrush is regularily pasted")
HELP_TEXT ("on the picture. This drawing tool allows to")
HELP_TEXT ("change the fore and back colors when being")
HELP_TEXT ("mouse, the paintbrush is regularly pasted")
HELP_TEXT ("on the picture. This drawing tool allows you")
HELP_TEXT ("to change the fore and back colors when")
HELP_TEXT ("in use.")
HELP_TEXT ("")
HELP_TEXT ("Discontinuous hand-drawing: as you move the")
@@ -840,8 +840,8 @@ static const T_Help_table helptable_draw[] =
HELP_TEXT ("picture every time a delay is passed")
HELP_TEXT ("(actually, the delay is 1 VBL")
HELP_TEXT ("(vertical blanking)). This drawing tool")
HELP_TEXT ("allows to change the fore and back colors")
HELP_TEXT ("when being in use.")
HELP_TEXT ("allows you to change the fore and back")
HELP_TEXT ("colors when in use.")
HELP_TEXT ("")
HELP_TEXT ("Dot by dot hand-drawing: the paintbrush is")
HELP_TEXT ("only pasted at the position where you first")
@@ -930,8 +930,8 @@ static const T_Help_table helptable_lines[] =
HELP_TEXT ("from the center to the current mouse")
HELP_TEXT ("position by clicking. To stop drawing")
HELP_TEXT ("concentric lines, use the opposite mouse")
HELP_TEXT ("button. This drawing tool allows to change")
HELP_TEXT ("the fore and back colors when being in use.")
HELP_TEXT ("button. This drawing tool allows you to")
HELP_TEXT ("change the fore and back colors when in use.")
HELP_TEXT ("")
HELP_BOLD ("RIGHT CLICK")
HELP_LINK ("(Key:%s)",0x200+BUTTON_LINES)
@@ -949,8 +949,8 @@ static const T_Help_table helptable_airbrush[] =
HELP_LINK ("(Key:%s)",0x100+BUTTON_AIRBRUSH)
HELP_TEXT ("")
HELP_TEXT ("Selects the spray as the active drawing")
HELP_TEXT ("tool. This drawing tool allows to change the")
HELP_TEXT ("fore and back colors when being in use.")
HELP_TEXT ("tool. This drawing tool allows you to change")
HELP_TEXT ("the fore and back colors when in use.")
HELP_TEXT ("")
HELP_BOLD ("RIGHT CLICK")
HELP_LINK ("(Key:%s)",0x200+BUTTON_AIRBRUSH)
@@ -988,7 +988,7 @@ static const T_Help_table helptable_airbrush[] =
HELP_TEXT ("- Init: Allows you to define a value that")
HELP_TEXT ("will be set to the color you click on in the")
HELP_TEXT ("palette if its value is equal to 0. This")
HELP_TEXT ("permits to tag a set of colors more quickly.")
HELP_TEXT ("permits you to tag a set of colors quickly.")
HELP_TEXT ("")
HELP_TEXT ("- +1,-1,x2,/2: Modify the values of all the")
HELP_TEXT ("tagged colors (and only them).")
@@ -1032,9 +1032,9 @@ static const T_Help_table helptable_floodfill[] =
HELP_TEXT ("is the only one to be affected by no effect")
HELP_TEXT ("(except Stencil) and to be able to modify")
HELP_TEXT ("non visible parts of the picture.")
HELP_TEXT ("The function of this tool being replacing")
HELP_TEXT ("all the occurences of a color in the picture")
HELP_TEXT ("by another, if would have been a shame to")
HELP_TEXT ("The purpose of this tool being to replace")
HELP_TEXT ("all occurrences of a color in the picture")
HELP_TEXT ("by another, it would have been a shame to")
HELP_TEXT ("limit modifications only to the visible part")
HELP_TEXT ("of the picture.")
};
@@ -1371,7 +1371,7 @@ static const T_Help_table helptable_brush_fx[] =
HELP_TEXT ("button.")
HELP_TEXT ("")
HELP_LINK ("- Outline: (Key:%s)",SPECIAL_OUTLINE)
HELP_TEXT ("This option permits to draw the")
HELP_TEXT ("This option permits you to draw the")
HELP_TEXT ("outlines of the brush with the Fore- color.")
HELP_TEXT ("")
HELP_LINK ("- Nibble: (Key:%s)",SPECIAL_NIBBLE)
@@ -1497,14 +1497,14 @@ static const T_Help_table helptable_effects[] =
HELP_TEXT ("in each table.")
HELP_TEXT ("")
HELP_TEXT ("- A window (on the top-right side) permits")
HELP_TEXT ("to visualize the different")
HELP_TEXT ("shades defined in he current table.")
HELP_TEXT ("you to visualize the different")
HELP_TEXT ("shades defined in the current table.")
HELP_TEXT ("")
HELP_TEXT ("- Copy: Copy the contents of the table in a")
HELP_TEXT ("buffer.")
HELP_TEXT ("(Each time you open this menu, the current")
HELP_TEXT ("table is automatically")
HELP_TEXT ("transfered into this buffer).")
HELP_TEXT ("transferred into this buffer).")
HELP_TEXT ("")
HELP_TEXT ("- Paste: Copy the contents of the buffer")
HELP_TEXT ("above in the current table.")
@@ -1519,7 +1519,7 @@ static const T_Help_table helptable_effects[] =
HELP_TEXT ("color is selected in the table THEN It is")
HELP_TEXT ("deleted and the block defined in the palette")
HELP_TEXT ("is inserted. ELSE The block defined in the")
HELP_TEXT ("palette is inserted at the postion just")
HELP_TEXT ("palette is inserted at the position just")
HELP_TEXT ("before the selected square. END IF")
HELP_TEXT ("ELSE The block defined in the palette is")
HELP_TEXT ("inserted by erasing the colors following the")
@@ -1778,8 +1778,8 @@ static const T_Help_table helptable_effects[] =
HELP_TEXT ("")
HELP_TEXT ("")
HELP_TITLE("TRANSPARENCY")
HELP_TEXT (" This allows to mix the color(s) of the")
HELP_TEXT ("paintbrush with the colors of the picture.")
HELP_TEXT (" This allows you to mix the color(s) of the")
HELP_TEXT ("paintbrush with the colors of the picture.")
HELP_TEXT ("It's used to make transparency effects like")
HELP_TEXT ("with watercolors.")
HELP_TEXT ("")
@@ -1929,7 +1929,7 @@ static const T_Help_table helptable_effects[] =
HELP_BOLD ("LEFT CLICK")
HELP_TEXT ("Open the menu if no constraint type has been")
HELP_TEXT ("already selected.")
HELP_TEXT ("Else enable/disable the contraints")
HELP_TEXT ("Else enable/disable the constraints")
HELP_TEXT ("")
HELP_BOLD ("RIGHT CLICK")
HELP_TEXT ("Open the menu to choose the type of")
@@ -2652,7 +2652,7 @@ static const T_Help_table helptable_settings_details[] =
HELP_TEXT ("drawing mode after brush grabbing.")
HELP_TEXT ("")
HELP_BOLD (" Auto nb colors used")
HELP_TEXT ("Automaticaly count the number of different")
HELP_TEXT ("Automatically count the number of different")
HELP_TEXT ("colors used when opening the palette editor")
HELP_TEXT ("window. (Set it to 'no' if you have a slow")
HELP_TEXT ("computer or if you edit huge pictures)")

View File

@@ -706,7 +706,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
KEY_z|MOD_SHIFT, // Shift + Z
0},
{74,
"Strech brush",
"Stretch brush",
"Allows you to resize the",
"user-defined brush.",
"",
@@ -1094,7 +1094,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
0},
{112,
"Center brush attachment point",
"Set the attachement of the",
"Set the attachment of the",
"user-defined brush to its center.",
"",
true,
@@ -1102,7 +1102,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
0},
{113,
"Top-left brush attachment point",
"Set the attachement of the",
"Set the attachment of the",
"user-defined brush to its top-left",
"corner.",
true,
@@ -1110,7 +1110,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
0},
{114,
"Top-right brush attachment point",
"Set the attachement of the",
"Set the attachment of the",
"user-defined brush to its top-right",
"corner.",
true,
@@ -1118,7 +1118,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
0},
{115,
"Bottom-left brush attachment point",
"Set the attachement of the",
"Set the attachment of the",
"user-defined brush to its",
"bottom-left corner.",
true,
@@ -1126,7 +1126,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
0},
{116,
"Bottom-right brush attachment point",
"Set the attachement of the",
"Set the attachment of the",
"user-defined brush to its",
"bottom-right corner.",
true,
@@ -1965,11 +1965,11 @@ word Ordering[NB_SHORTCUTS]=
0x100+BUTTON_PAL_RIGHT, // Scroll palette right
0x200+BUTTON_PAL_LEFT, // Scroll palette left faster
0x200+BUTTON_PAL_RIGHT, // Scroll palette right faster
SPECIAL_CENTER_ATTACHMENT, // Center brush attachement
SPECIAL_TOP_LEFT_ATTACHMENT, // Top-left brush attachement
SPECIAL_TOP_RIGHT_ATTACHMENT, // Top-right brush attachement
SPECIAL_BOTTOM_LEFT_ATTACHMENT, // Bottom-left brush attachement
SPECIAL_BOTTOM_RIGHT_ATTACHMENT, // Bottom right brush attachement
SPECIAL_CENTER_ATTACHMENT, // Center brush attachment
SPECIAL_TOP_LEFT_ATTACHMENT, // Top-left brush attachment
SPECIAL_TOP_RIGHT_ATTACHMENT, // Top-right brush attachment
SPECIAL_BOTTOM_LEFT_ATTACHMENT, // Bottom-left brush attachment
SPECIAL_BOTTOM_RIGHT_ATTACHMENT, // Bottom right brush attachment
SPECIAL_NEXT_FORECOLOR, // Next foreground color
SPECIAL_PREVIOUS_FORECOLOR, // Previous foreground color
SPECIAL_NEXT_BACKCOLOR, // Next background color

View File

@@ -212,7 +212,7 @@ void Error_function(int error_code, const char *filename, int line_number, const
int index;
char msg_buffer[512];
snprintf(msg_buffer, sizeof(msg_buffer), "Error number %d occured in file %s, line %d, function %s.\n", error_code, filename,line_number,function_name);
snprintf(msg_buffer, sizeof(msg_buffer), "Error number %d occurred in file %s, line %d, function %s.\n", error_code, filename,line_number,function_name);
fputs(msg_buffer, stderr);
#if defined(_MSC_VER) && defined(_DEBUG)
OutputDebugStringA(msg_buffer);

View File

@@ -192,12 +192,12 @@ long Perceptual_lightness(T_Components *color)
19*color->B*19*color->B;
}
// Handlers for the occurences tables
// This table is used to count the occurence of an (RGB) pixel value in the
// Handlers for the occurrences tables
// This table is used to count the occurrence of an (RGB) pixel value in the
// source 24bit image. These count are then used by the median cut algorithm to
// decide which cluster to split.
/// Initialize an occurence table
/// Initialize an occurrence table
void OT_init(T_Occurrence_table * t)
{
int size;
@@ -206,7 +206,7 @@ void OT_init(T_Occurrence_table * t)
memset(t->table,0,size); // Set it to 0
}
/// Allocate an occurence table for given number of bits
/// Allocate an occurrence table for given number of bits
T_Occurrence_table * OT_new(int nbb_r,int nbb_g,int nbb_b)
{
T_Occurrence_table * n;
@@ -255,7 +255,7 @@ void OT_delete(T_Occurrence_table * t)
}
/// Get number of occurences for a given color
/// Get number of occurrences for a given color
int OT_get(T_Occurrence_table * t, byte r, byte g, byte b)
{
int index;
@@ -293,7 +293,7 @@ void OT_count_occurrences(T_Occurrence_table* t, T_Bitmap24B image, int size)
}
/// Count the total number of pixels in an occurence table
/// Count the total number of pixels in an occurrence table
int OT_count_colors(T_Occurrence_table * t)
{
int val; // Computed return value
@@ -341,7 +341,7 @@ void Cluster_pack(T_Cluster * c,const T_Occurrence_table * const to)
// Unoptimized code kept here for documentation purpose because the optimized
// one is unreadable : run over the whole cluster and find the min and max,
// and count the occurences at the same time.
// and count the occurrences at the same time.
/*
for (r=c->rmin<<to->dec_r;r<=c->rmax<<to->dec_r;r+=1<<to->dec_r)
for (g=c->vmin<<to->dec_g;g<=c->vmax<<to->dec_g;g+=1<<to->dec_g)
@@ -356,7 +356,7 @@ void Cluster_pack(T_Cluster * c,const T_Occurrence_table * const to)
else if (g>vmax) vmax=g;
if (b<bmin) bmin=b;
else if (b>bmax) bmax=b;
c->occurences+=nbocc;
c->occurrences+=nbocc;
}
}
*/
@@ -866,7 +866,7 @@ int CS_Set(T_Cluster_set * cs,T_Cluster * c)
/// This is the main median cut algorithm and the function actually called to
/// reduce the palette. We get the number of pixels for each collor in the
/// occurence table and generate the cluster set from it.
/// occurrence table and generate the cluster set from it.
// 1) RGB space is a big box
// 2) We seek the pixels with extreme values
// 3) We split the box in 2 parts on its longest axis
@@ -918,7 +918,7 @@ int CS_Generate(T_Cluster_set * cs, const T_Occurrence_table * const to, CT_Tree
if(CS_Set(cs,&Nouveau1) < 0)
return -1;
}
if (Nouveau2.occurences != 0) {
if(CS_Set(cs,&Nouveau2) < 0)
return -1;

View File

@@ -249,7 +249,7 @@ void Tilemap_update(void)
}
if (ref_tile<tile)
{
// New occurence of a known tile
// New occurrence of a known tile
// Insert at the end. classic doubly-linked-list.
int last_tile=Main.tilemap[ref_tile].Previous;
Main.tilemap[tile].Previous=last_tile;
@@ -272,7 +272,7 @@ void Tilemap_update(void)
}
if (ref_tile<tile)
{
// New occurence of a known tile
// New occurrence of a known tile
// Insert at the end. classic doubly-linked-list.
int last_tile=Main.tilemap[ref_tile].Previous;
Main.tilemap[tile].Previous=last_tile;
@@ -296,7 +296,7 @@ void Tilemap_update(void)
}
if (ref_tile<tile)
{
// New occurence of a known tile
// New occurrence of a known tile
// Insert at the end. classic doubly-linked-list.
int last_tile=Main.tilemap[ref_tile].Previous;
Main.tilemap[tile].Previous=last_tile;
@@ -320,7 +320,7 @@ void Tilemap_update(void)
}
if (ref_tile<tile)
{
// New occurence of a known tile
// New occurrence of a known tile
// Insert at the end. classic doubly-linked-list.
int last_tile=Main.tilemap[ref_tile].Previous;
Main.tilemap[tile].Previous=last_tile;