Commit 48629c97 authored by coppro's avatar coppro

Fixed installer bugs, added documentation for crop function.

parent e07ca4e5
Function: crop
--Usage--
> crop(input: image, height: height_of_new_image, width: width_of_new_image, offset_x: x_position_to_start_crop, offset_y: y_position_to_start_crop)
Shrink an image by cutting off some of the image, starting at the position denoted by the offsets. The resulting image size is specified in the parameters.
--Parameters--
! Parameter Type Description
| @input@ [[type:image]] Image to enlarge
| @height@ [[type:double]] Height of the resulting image
| @width@ [[type:double]] Width of the resulting image
| @offset_x@ [[type:double]] Offset of crop, horizontally
| @offset_y@ [[type:double]] Offset of crop, vertically
...@@ -65,6 +65,7 @@ These functions are built into the program, other [[type:function]]s can be defi ...@@ -65,6 +65,7 @@ These functions are built into the program, other [[type:function]]s can be defi
| [[fun:set_alpha]] Change the transparency of an image. | [[fun:set_alpha]] Change the transparency of an image.
| [[fun:set_combine]] Chnage how the image should be combined with the background. | [[fun:set_combine]] Chnage how the image should be combined with the background.
| [[fun:enlarge]] Enlarge an image by putting a border around it. | [[fun:enlarge]] Enlarge an image by putting a border around it.
| [[fun:crop]] Crop an image, giving only a small subset of it.
| [[fun:drop_shadow]] Add a drop shadow to an image. | [[fun:drop_shadow]] Add a drop shadow to an image.
| [[fun:symbol_variation]] Render a variation of a [[type:symbol]]. | [[fun:symbol_variation]] Render a variation of a [[type:symbol]].
| [[fun:built_in_image]] Return an image built into the program. | [[fun:built_in_image]] Return an image built into the program.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
DECLARE_TYPEOF_COLLECTION(String); DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(PackageP); DECLARE_TYPEOF_COLLECTION(PackagedP);
DECLARE_TYPEOF_COLLECTION(PackageDependencyP); DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
DECLARE_POINTER_TYPE(wxFileInputStream); DECLARE_POINTER_TYPE(wxFileInputStream);
DECLARE_POINTER_TYPE(wxZipInputStream); DECLARE_POINTER_TYPE(wxZipInputStream);
...@@ -85,7 +85,7 @@ void Installer::install(bool local) { ...@@ -85,7 +85,7 @@ void Installer::install(bool local) {
else { else {
throw PackageError(_("Unrecognized package type: '") + fn + _("'\nwhile trying to install: ") + p); throw PackageError(_("Unrecognized package type: '") + fn + _("'\nwhile trying to install: ") + p);
} }
Reader reader(openIn(p + _("/") + fn.Mid(4))); Reader reader(openIn(p + _("/") + pack->typeName()));
pack->Packaged::reflect_impl(reader); pack->Packaged::reflect_impl(reader);
new_packages.push_back(pack); new_packages.push_back(pack);
} }
......
...@@ -226,6 +226,7 @@ class Packaged : public Package { ...@@ -226,6 +226,7 @@ class Packaged : public Package {
private: private:
bool fully_loaded; ///< Is the package fully loaded? bool fully_loaded; ///< Is the package fully loaded?
friend struct JustAsPackageProxy; friend struct JustAsPackageProxy;
friend class Installer;
}; };
// ----------------------------------------------------------------------------- : IncludePackage // ----------------------------------------------------------------------------- : IncludePackage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment