Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: fpdfsdk/fsdk_baseannot.cpp

Issue 2034253003: Fix more code which has shadow variables (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: address comments and style fix Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxcrt/include/fx_coordinates.h ('k') | fpdfsdk/javascript/Consts.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/fsdk_baseannot.cpp
diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp
index 1345f234b653d1c68a6f7455dc0b5f1841809415..7dcb663505aec9eca289f84c573dc738c012a52a 100644
--- a/fpdfsdk/fsdk_baseannot.cpp
+++ b/fpdfsdk/fsdk_baseannot.cpp
@@ -376,8 +376,7 @@ CFX_ByteString CPDFSDK_DateTime::ToPDFDateTimeString() {
}
void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) {
- CPDFSDK_DateTime dt = *this;
- time_t t = (time_t)dt;
+ time_t t = (time_t)(*this);
struct tm* pTime = localtime(&t);
if (pTime) {
st.wYear = (uint16_t)pTime->tm_year + 1900;
@@ -392,11 +391,12 @@ void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) {
}
CPDFSDK_DateTime CPDFSDK_DateTime::ToGMT() const {
- CPDFSDK_DateTime dt = *this;
- dt.AddSeconds(-gAfxGetTimeZoneInSeconds(dt.dt.tzHour, dt.dt.tzMinute));
- dt.dt.tzHour = 0;
- dt.dt.tzMinute = 0;
- return dt;
+ CPDFSDK_DateTime new_dt = *this;
+ new_dt.AddSeconds(
+ -gAfxGetTimeZoneInSeconds(new_dt.dt.tzHour, new_dt.dt.tzMinute));
+ new_dt.dt.tzHour = 0;
+ new_dt.dt.tzMinute = 0;
+ return new_dt;
}
CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) {
« no previous file with comments | « core/fxcrt/include/fx_coordinates.h ('k') | fpdfsdk/javascript/Consts.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698