From 650d3ec820b3a14d77d2d3642dfacd2be7dbffe0 Mon Sep 17 00:00:00 2001 From: Chris Kirmse Date: Thu, 14 Mar 2019 09:26:56 -0700 Subject: [PATCH] fix grammar error with possessive its and update sample for audio parameter --- CMakeLists.txt | 8 ++++---- include/Clip.h | 4 ++-- include/EffectBase.h | 2 +- include/FFmpegReader.h | 8 ++++---- include/FFmpegWriter.h | 4 ++-- include/Frame.h | 2 +- include/ImageReader.h | 2 +- include/ImageWriter.h | 2 +- include/QtImageReader.h | 2 +- include/Timeline.h | 1 + include/effects/Bars.h | 2 +- include/effects/Blur.h | 2 +- include/effects/Brightness.h | 2 +- include/effects/ChromaKey.h | 2 +- include/effects/ColorShift.h | 2 +- include/effects/Crop.h | 2 +- include/effects/Deinterlace.h | 2 +- include/effects/Hue.h | 2 +- include/effects/Mask.h | 2 +- include/effects/Negate.h | 2 +- include/effects/Pixelate.h | 2 +- include/effects/Saturation.h | 2 +- include/effects/Shift.h | 2 +- include/effects/Wave.h | 2 +- src/ChunkReader.cpp | 2 +- src/Clip.cpp | 2 +- src/DummyReader.cpp | 2 +- src/FFmpegReader.cpp | 10 +++++----- src/Frame.cpp | 2 +- src/ImageReader.cpp | 6 +++--- src/QtImageReader.cpp | 6 +++--- src/TextReader.cpp | 4 ++-- 32 files changed, 49 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaf7d65f..a4926953 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ # # Copyright (c) 2008-2014 OpenShot Studios, LLC # . This file is part of -# OpenShot Library (libopenshot), an open-source project dedicated to -# delivering high quality video editing and animation solutions to the +# OpenShot Library (libopenshot), an open-source project dedicated to +# delivering high quality video editing and animation solutions to the # world. For more information visit . # # OpenShot Library (libopenshot) is free software: you can redistribute it @@ -41,8 +41,8 @@ MESSAGE("Determining Version Number (from Version.h file)") #### Get the lines related to libopenshot version from the Version.h header file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/Version.h OPENSHOT_VERSION_LINES REGEX "#define[ ]+OPENSHOT_VERSION_.*[0-9]+;.*") - -#### Set each line into it's own variable + +#### Set each line into its own variable list (GET OPENSHOT_VERSION_LINES 0 LINE_MAJOR) list (GET OPENSHOT_VERSION_LINES 1 LINE_MINOR) list (GET OPENSHOT_VERSION_LINES 2 LINE_BUILD) diff --git a/include/Clip.h b/include/Clip.h index 3cd33b3a..83387fac 100644 --- a/include/Clip.h +++ b/include/Clip.h @@ -142,8 +142,8 @@ namespace openshot { void reverse_buffer(juce::AudioSampleBuffer* buffer); public: - GravityType gravity; ///< The gravity of a clip determines where it snaps to it's parent - ScaleType scale; ///< The scale determines how a clip should be resized to fit it's parent + GravityType gravity; ///< The gravity of a clip determines where it snaps to its parent + ScaleType scale; ///< The scale determines how a clip should be resized to fit its parent AnchorType anchor; ///< The anchor determines what parent a clip should snap to FrameDisplayType display; ///< The format to display the frame number (if any) VolumeMixType mixing; ///< What strategy should be followed when mixing audio with other clips diff --git a/include/EffectBase.h b/include/EffectBase.h index 209369a8..8df7fabf 100644 --- a/include/EffectBase.h +++ b/include/EffectBase.h @@ -82,7 +82,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h index eaa45943..f24dac9f 100644 --- a/include/FFmpegReader.h +++ b/include/FFmpegReader.h @@ -150,7 +150,7 @@ namespace openshot /// Check the current seek position and determine if we need to seek again bool CheckSeek(bool is_video); - /// Check if a frame is missing and attempt to replace it's frame image (and + /// Check if a frame is missing and attempt to replace its frame image (and bool CheckMissingFrame(int64_t requested_frame); /// Check the working queue, and move finished frames to the finished queue @@ -198,10 +198,10 @@ namespace openshot /// Read the stream until we find the requested Frame std::shared_ptr ReadStream(int64_t requested_frame); - /// Remove AVFrame from cache (and deallocate it's memory) + /// Remove AVFrame from cache (and deallocate its memory) void RemoveAVFrame(AVFrame*); - /// Remove AVPacket from cache (and deallocate it's memory) + /// Remove AVPacket from cache (and deallocate its memory) void RemoveAVPacket(AVPacket*); /// Seek to a specific Frame. This is not always frame accurate, it's more of an estimation on many codecs. @@ -228,7 +228,7 @@ namespace openshot /// frame 1, or it throws one of the following exceptions. FFmpegReader(string path); - /// Constructor for FFmpegReader. This only opens the media file to inspect it's properties + /// Constructor for FFmpegReader. This only opens the media file to inspect its properties /// if inspect_reader=true. When not inspecting the media file, it's much faster, and useful /// when you are inflating the object using JSON after instantiating it. FFmpegReader(string path, bool inspect_reader); diff --git a/include/FFmpegWriter.h b/include/FFmpegWriter.h index e219f72c..c9351af7 100644 --- a/include/FFmpegWriter.h +++ b/include/FFmpegWriter.h @@ -83,7 +83,7 @@ namespace openshot * FFmpegWriter w("/home/jonathan/NewVideo.webm"); * * // Set options - * w.SetAudioOptions(true, "libvorbis", 44100, 2, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 + * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 * * // Open the writer @@ -110,7 +110,7 @@ namespace openshot * FFmpegWriter w("/home/jonathan/NewVideo.webm"); * * // Set options - * w.SetAudioOptions(true, "libvorbis", 44100, 2, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 + * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 * * // Prepare Streams (Optional method that must be called before any SetOption calls) diff --git a/include/Frame.h b/include/Frame.h index eba7f8bb..f89149e2 100644 --- a/include/Frame.h +++ b/include/Frame.h @@ -197,7 +197,7 @@ namespace openshot /// Clean up buffer after QImage is deleted static void cleanUpBuffer(void *info); - /// Clear the waveform image (and deallocate it's memory) + /// Clear the waveform image (and deallocate its memory) void ClearWaveform(); /// Copy data and pointers from another Frame instance diff --git a/include/ImageReader.h b/include/ImageReader.h index e698e0c1..a44cbf07 100644 --- a/include/ImageReader.h +++ b/include/ImageReader.h @@ -77,7 +77,7 @@ namespace openshot /// frame 1, or it throws one of the following exceptions. ImageReader(string path); - /// Constructor for ImageReader. This only opens the media file to inspect it's properties + /// Constructor for ImageReader. This only opens the media file to inspect its properties /// if inspect_reader=true. When not inspecting the media file, it's much faster, and useful /// when you are inflating the object using JSON after instantiating it. ImageReader(string path, bool inspect_reader); diff --git a/include/ImageWriter.h b/include/ImageWriter.h index 25177134..ded29a5b 100644 --- a/include/ImageWriter.h +++ b/include/ImageWriter.h @@ -127,7 +127,7 @@ namespace openshot /// @param height Height in pixels of image /// @param quality Quality of image (0 to 100, 70 is default) /// @param loops Number of times to repeat the image (used on certain multi-frame image formats, such as GIF) - /// @param combine Combine frames into a single image (if possible), or save each frame as it's own image + /// @param combine Combine frames into a single image (if possible), or save each frame as its own image void SetVideoOptions(string format, Fraction fps, int width, int height, int quality, int loops, bool combine); diff --git a/include/QtImageReader.h b/include/QtImageReader.h index 6b260f15..a7be1ab6 100644 --- a/include/QtImageReader.h +++ b/include/QtImageReader.h @@ -75,7 +75,7 @@ namespace openshot /// frame 1, or it throws one of the following exceptions. QtImageReader(string path); - /// Constructor for QtImageReader. This only opens the media file to inspect it's properties + /// Constructor for QtImageReader. This only opens the media file to inspect its properties /// if inspect_reader=true. When not inspecting the media file, it's much faster, and useful /// when you are inflating the object using JSON after instantiating it. QtImageReader(string path, bool inspect_reader); diff --git a/include/Timeline.h b/include/Timeline.h index 312add2e..6fd88796 100644 --- a/include/Timeline.h +++ b/include/Timeline.h @@ -100,6 +100,7 @@ namespace openshot { * Fraction(25,1), // framerate * 44100, // sample rate * 2 // channels + * ChannelLayout::LAYOUT_STEREO, * ); * * // Create some clips diff --git a/include/effects/Bars.h b/include/effects/Bars.h index 27d21725..247a914a 100644 --- a/include/effects/Bars.h +++ b/include/effects/Bars.h @@ -80,7 +80,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Blur.h b/include/effects/Blur.h index 314dabbe..f72bf484 100644 --- a/include/effects/Blur.h +++ b/include/effects/Blur.h @@ -93,7 +93,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Brightness.h b/include/effects/Brightness.h index 67ab4c9c..eb74c58f 100644 --- a/include/effects/Brightness.h +++ b/include/effects/Brightness.h @@ -80,7 +80,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/ChromaKey.h b/include/effects/ChromaKey.h index 000dbba4..b93b8f51 100644 --- a/include/effects/ChromaKey.h +++ b/include/effects/ChromaKey.h @@ -77,7 +77,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/ColorShift.h b/include/effects/ColorShift.h index 4b3de2bb..88d6e4d0 100644 --- a/include/effects/ColorShift.h +++ b/include/effects/ColorShift.h @@ -84,7 +84,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Crop.h b/include/effects/Crop.h index 7921a78d..c9836824 100644 --- a/include/effects/Crop.h +++ b/include/effects/Crop.h @@ -80,7 +80,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Deinterlace.h b/include/effects/Deinterlace.h index c1fb7227..1bb29062 100644 --- a/include/effects/Deinterlace.h +++ b/include/effects/Deinterlace.h @@ -73,7 +73,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Hue.h b/include/effects/Hue.h index 4f680047..fa59ab4e 100644 --- a/include/effects/Hue.h +++ b/include/effects/Hue.h @@ -70,7 +70,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Mask.h b/include/effects/Mask.h index ef707f5f..210ffe9c 100644 --- a/include/effects/Mask.h +++ b/include/effects/Mask.h @@ -91,7 +91,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Negate.h b/include/effects/Negate.h index 84621132..2397e331 100644 --- a/include/effects/Negate.h +++ b/include/effects/Negate.h @@ -61,7 +61,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Pixelate.h b/include/effects/Pixelate.h index b8ca2998..1d62192d 100644 --- a/include/effects/Pixelate.h +++ b/include/effects/Pixelate.h @@ -79,7 +79,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Saturation.h b/include/effects/Saturation.h index d49069a6..f7c20341 100644 --- a/include/effects/Saturation.h +++ b/include/effects/Saturation.h @@ -77,7 +77,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Shift.h b/include/effects/Shift.h index 86ccf7a4..875c736b 100644 --- a/include/effects/Shift.h +++ b/include/effects/Shift.h @@ -73,7 +73,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/include/effects/Wave.h b/include/effects/Wave.h index 04c1620f..11047097 100644 --- a/include/effects/Wave.h +++ b/include/effects/Wave.h @@ -79,7 +79,7 @@ namespace openshot /// modified openshot::Frame object /// /// The frame object is passed into this method, and a frame_number is passed in which - /// tells the effect which settings to use from it's keyframes (starting at 1). + /// tells the effect which settings to use from its keyframes (starting at 1). /// /// @returns The modified openshot::Frame object /// @param frame The frame object that needs the effect applied to it diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp index fe552243..ac6835d0 100644 --- a/src/ChunkReader.cpp +++ b/src/ChunkReader.cpp @@ -42,7 +42,7 @@ ChunkReader::ChunkReader(string path, ChunkVersion chunk_version) previous_location.number = 0; previous_location.frame = 0; - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } diff --git a/src/Clip.cpp b/src/Clip.cpp index 207494e3..33ff5093 100644 --- a/src/Clip.cpp +++ b/src/Clip.cpp @@ -272,7 +272,7 @@ void Clip::Close() // Get end position of clip (trim end of video), which can be affected by the time curve. float Clip::End() { - // if a time curve is present, use it's length + // if a time curve is present, use its length if (time.Points.size() > 1) { // Determine the FPS fo this clip diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp index 8fe039ab..25c45f5c 100644 --- a/src/DummyReader.cpp +++ b/src/DummyReader.cpp @@ -66,7 +66,7 @@ DummyReader::DummyReader(Fraction fps, int width, int height, int sample_rate, i info.display_ratio.num = size.num; info.display_ratio.den = size.den; - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index a8d1d746..d5f69b0c 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -49,7 +49,7 @@ FFmpegReader::FFmpegReader(string path) missing_frames.SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels); final_cache.SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels); - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } @@ -71,7 +71,7 @@ FFmpegReader::FFmpegReader(string path, bool inspect_reader) missing_frames.SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels); final_cache.SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels); - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) if (inspect_reader) { Open(); Close(); @@ -1698,7 +1698,7 @@ bool FFmpegReader::IsPartialFrame(int64_t requested_frame) { return seek_trash; } -// Check if a frame is missing and attempt to replace it's frame image (and +// Check if a frame is missing and attempt to replace its frame image (and bool FFmpegReader::CheckMissingFrame(int64_t requested_frame) { // Lock @@ -2025,7 +2025,7 @@ void FFmpegReader::CheckFPS() } } -// Remove AVFrame from cache (and deallocate it's memory) +// Remove AVFrame from cache (and deallocate its memory) void FFmpegReader::RemoveAVFrame(AVFrame* remove_frame) { // Remove pFrame (if exists) @@ -2042,7 +2042,7 @@ void FFmpegReader::RemoveAVFrame(AVFrame* remove_frame) } } -// Remove AVPacket from cache (and deallocate it's memory) +// Remove AVPacket from cache (and deallocate its memory) void FFmpegReader::RemoveAVPacket(AVPacket* remove_packet) { // deallocate memory for packet diff --git a/src/Frame.cpp b/src/Frame.cpp index a00fc232..263eb5af 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -263,7 +263,7 @@ std::shared_ptr Frame::GetWaveform(int width, int height, int Red, int G return wave_image; } -// Clear the waveform image (and deallocate it's memory) +// Clear the waveform image (and deallocate its memory) void Frame::ClearWaveform() { if (wave_image) diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp index f535666a..937457b0 100644 --- a/src/ImageReader.cpp +++ b/src/ImageReader.cpp @@ -31,14 +31,14 @@ using namespace openshot; ImageReader::ImageReader(string path) : path(path), is_open(false) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } ImageReader::ImageReader(string path, bool inspect_reader) : path(path), is_open(false) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) if (inspect_reader) { Open(); Close(); @@ -106,7 +106,7 @@ void ImageReader::Close() { // Mark as "closed" is_open = false; - + // Delete the image image.reset(); } diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index c500d221..a0108f48 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -43,14 +43,14 @@ using namespace openshot; QtImageReader::QtImageReader(string path) : path(path), is_open(false) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } QtImageReader::QtImageReader(string path, bool inspect_reader) : path(path), is_open(false) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) if (inspect_reader) { Open(); Close(); @@ -143,7 +143,7 @@ void QtImageReader::Close() { // Mark as "closed" is_open = false; - + // Delete the image image.reset(); diff --git a/src/TextReader.cpp b/src/TextReader.cpp index 8234aa5d..5c8256b6 100644 --- a/src/TextReader.cpp +++ b/src/TextReader.cpp @@ -32,7 +32,7 @@ using namespace openshot; /// Default constructor (blank text) TextReader::TextReader() : width(1024), height(768), x_offset(0), y_offset(0), text(""), font("Arial"), size(10.0), text_color("#ffffff"), background_color("#000000"), is_open(false), gravity(GRAVITY_CENTER) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); } @@ -40,7 +40,7 @@ TextReader::TextReader() : width(1024), height(768), x_offset(0), y_offset(0), t TextReader::TextReader(int width, int height, int x_offset, int y_offset, GravityType gravity, string text, string font, double size, string text_color, string background_color) : width(width), height(height), x_offset(x_offset), y_offset(y_offset), text(text), font(font), size(size), text_color(text_color), background_color(background_color), is_open(false), gravity(gravity) { - // Open and Close the reader, to populate it's attributes (such as height, width, etc...) + // Open and Close the reader, to populate its attributes (such as height, width, etc...) Open(); Close(); }