/boot/home/develop/haiku/trunk/src/apps/showimage Index: ShowImageWindow.cpp =================================================================== --- ShowImageWindow.cpp (revision 17175) +++ ShowImageWindow.cpp (working copy) @@ -329,8 +329,8 @@ AddItemMenu(menu, "Rotate -90°", MSG_ROTATE_270, '[', 0, 'W', true); AddItemMenu(menu, "Rotate +90°", MSG_ROTATE_90, ']', 0, 'W', true); menu->AddSeparatorItem(); - AddItemMenu(menu, "Mirror Vertical", MSG_MIRROR_VERTICAL, 0, 0, 'W', true); - AddItemMenu(menu, "Mirror Horizontal", MSG_MIRROR_HORIZONTAL, 0, 0, 'W', true); + AddItemMenu(menu, "Flip Sideways", MSG_FLIP_SIDEWAYS, 0, 0, 'W', true); + AddItemMenu(menu, "Flip Upside Down", MSG_FLIP_UPSIDE_DOWN, 0, 0, 'W', true); menu->AddSeparatorItem(); AddItemMenu(menu, "Invert", MSG_INVERT, 0, 0, 'W', true); bar->AddItem(menu); @@ -717,11 +717,11 @@ case MSG_ROTATE_270: fImageView->Rotate(270); break; - case MSG_MIRROR_VERTICAL: - fImageView->Mirror(true); + case MSG_FLIP_SIDEWAYS: + fImageView->Flip(true); break; - case MSG_MIRROR_HORIZONTAL: - fImageView->Mirror(false); + case MSG_FLIP_UPSIDE_DOWN: + fImageView->Flip(false); break; case MSG_INVERT: fImageView->Invert(); Index: ShowImageView.cpp =================================================================== --- ShowImageView.cpp (revision 17175) +++ ShowImageView.cpp (working copy) @@ -497,18 +497,18 @@ DoImageOperation(ImageProcessor::kRotateAntiClockwise, true); break; case k0V: - DoImageOperation(ImageProcessor::ImageProcessor::kMirrorHorizontal, true); + DoImageOperation(ImageProcessor::ImageProcessor::kFlipUpsideDown, true); break; case k90V: DoImageOperation(ImageProcessor::kRotateClockwise, true); - DoImageOperation(ImageProcessor::ImageProcessor::kMirrorHorizontal, true); + DoImageOperation(ImageProcessor::ImageProcessor::kFlipUpsideDown, true); break; case k0H: - DoImageOperation(ImageProcessor::ImageProcessor::kMirrorVertical, true); + DoImageOperation(ImageProcessor::ImageProcessor::kFlipSideways, true); break; case k270V: DoImageOperation(ImageProcessor::kRotateAntiClockwise, true); - DoImageOperation(ImageProcessor::ImageProcessor::kMirrorHorizontal, true); + DoImageOperation(ImageProcessor::ImageProcessor::kFlipUpsideDown, true); break; } } @@ -2388,8 +2388,8 @@ // Note: If one of these fails, check its definition in class ImageProcessor. ASSERT(ImageProcessor::kRotateClockwise < ImageProcessor::kNumberOfAffineTransformations); ASSERT(ImageProcessor::kRotateAntiClockwise < ImageProcessor::kNumberOfAffineTransformations); - ASSERT(ImageProcessor::kMirrorVertical < ImageProcessor::kNumberOfAffineTransformations); - ASSERT(ImageProcessor::kMirrorHorizontal < ImageProcessor::kNumberOfAffineTransformations); + ASSERT(ImageProcessor::kFlipSideways < ImageProcessor::kNumberOfAffineTransformations); + ASSERT(ImageProcessor::kFlipUpsideDown < ImageProcessor::kNumberOfAffineTransformations); fImageOrientation = fTransformation[op][fImageOrientation]; } else { fInverted = !fInverted; @@ -2440,12 +2440,12 @@ void -ShowImageView::Mirror(bool vertical) +ShowImageView::Flip(bool vertical) { if (vertical) { - UserDoImageOperation(ImageProcessor::kMirrorVertical); + UserDoImageOperation(ImageProcessor::kFlipSideways); } else { - UserDoImageOperation(ImageProcessor::kMirrorHorizontal); + UserDoImageOperation(ImageProcessor::kFlipUpsideDown); } } Index: ShowImageView.h =================================================================== --- ShowImageView.h (revision 17175) +++ ShowImageView.h (working copy) @@ -101,7 +101,7 @@ // Image manipulation void Rotate(int degree); // 90 and 270 only - void Mirror(bool vertical); + void Flip(bool vertical); void Invert(); void SetIcon(bool clear); Index: ShowImageConstants.h =================================================================== --- ShowImageConstants.h (revision 17175) +++ ShowImageConstants.h (working copy) @@ -40,8 +40,8 @@ const uint32 MSG_ZOOM_TO_WINDOW = 'mZTW'; const uint32 MSG_ROTATE_90 = 'mR90'; const uint32 MSG_ROTATE_270 = 'mR27'; -const uint32 MSG_MIRROR_VERTICAL = 'mMIV'; -const uint32 MSG_MIRROR_HORIZONTAL = 'mMIH'; +const uint32 MSG_FLIP_SIDEWAYS = 'mFSW'; +const uint32 MSG_FLIP_UPSIDE_DOWN = 'mFUD'; const uint32 MSG_INVERT = 'mINV'; const uint32 MSG_SLIDE_SHOW = 'mSSW'; const uint32 MSG_SLIDE_SHOW_DELAY = 'mSSD'; Index: Filter.cpp =================================================================== --- Filter.cpp (revision 17175) +++ Filter.cpp (working copy) @@ -1068,7 +1068,7 @@ } } break; - case kMirrorHorizontal: + case kFlipUpsideDown: for (y = from; y <= to; y ++) { for (x = 0; x <= fWidth; x ++) { destX = x; @@ -1077,7 +1077,7 @@ } } break; - case kMirrorVertical: + case kFlipSideways: for (y = from; y <= to; y ++) { for (x = 0; x <= fWidth; x ++) { destX = fWidth - x; Index: Filter.h =================================================================== --- Filter.h (revision 17175) +++ Filter.h (working copy) @@ -189,8 +189,8 @@ enum operation { kRotateClockwise, kRotateAntiClockwise, - kMirrorVertical, - kMirrorHorizontal, + kFlipSideways, + kFlipUpsideDown, kInvert, kNumberOfAffineTransformations = 4 };