-
Notifications
You must be signed in to change notification settings - Fork 543
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.
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
CGS small update #2984
Open
Samma2009
wants to merge
15
commits into
CosmosOS:master
Choose a base branch
from
Samma2009:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
CGS small update #2984
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
03b7dc8
CGS small update
Samma2009 cfbd1ea
Update source/Cosmos.System2/Graphics/Canvas.cs
Samma2009 e3ca3ea
Update source/Cosmos.System2/Graphics/Bitmap.cs
Samma2009 848fe85
Update source/Cosmos.System2/Graphics/Bitmap.cs
Samma2009 1631991
Merge branch 'master' into master
Samma2009 71d15e2
Update Bitmap.cs
Samma2009 6af479d
Update Canvas.cs
Samma2009 5e03f70
Update packages.lock.json
Samma2009 9c45da5
Update source/Cosmos.System2/Graphics/Bitmap.cs
Samma2009 de7f2a8
Merge branch 'master' into master
Samma2009 21e323b
Update Bitmap.cs
Samma2009 2cfab4c
Update Bitmap.cs
Samma2009 9a2226d
Update Image.cs
Samma2009 3c15324
Update Image.cs
Samma2009 eccde20
Update Bitmap.cs
Samma2009 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -389,13 +389,36 @@ private void CreateBitmap(Stream stream, ColorOrder colorOrder) | |
/// <returns>resized image</returns> | ||
public static Bitmap Resize(Bitmap image, uint NewW, uint NewH) | ||
{ | ||
|
||
Bitmap tmp = new Bitmap(1,1,image.Depth); | ||
tmp.RawData = image.RawData; | ||
tmp.Resize(NewW,NewH); | ||
return tmp; | ||
} | ||
|
||
/// <summary> | ||
/// Gets a rectangle of pixels and stores it into a bitmap | ||
/// </summary> | ||
/// <param name="X">the x coordinate of the rectangle</param> | ||
/// <param name="Y">the y coordinate of the rectangle</param> | ||
/// <param name="W">the width of the rectangle</param> | ||
/// <param name="H">the height of the rectangle</param> | ||
/// <returns>bitmap</returns> | ||
public static Bitmap FromCanvasRegion(Canvas canvas,int X, int Y, ushort W, ushort H) | ||
Samma2009 marked this conversation as resolved.
Show resolved
Hide resolved
Samma2009 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please fix the additional new lines and tabbing of the function |
||
Bitmap tmp = new Bitmap(W, H, canvas.Mode.ColorDepth); | ||
|
||
Samma2009 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
for (int x = X; x < W + X; x++) | ||
{ | ||
for (int y = Y; y < H + Y; y++) | ||
{ | ||
tmp.SetPixel(canvas.GetPointColor(x, y), x - X, y - Y); | ||
} | ||
} | ||
|
||
return tmp; | ||
|
||
} | ||
|
||
/// <summary> | ||
/// Saves the given image as a BMP file. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rename
NewW
tonewWidth
andNewH
tonewHeight
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still not fixed